diff --git a/configure-grafana.yml b/configure-grafana.yml index 5453b29..13df535 100644 --- a/configure-grafana.yml +++ b/configure-grafana.yml @@ -2,11 +2,12 @@ - name: Configure Grafana hosts: localhost tasks: - - name: create netz39 user + - name: Create netz39 user community.grafana.grafana_user: url: "https://{{ hostvars['pottwal.n39.eu']['grafana_domain_name'] }}" url_username: admin - url_password: "{{ hostvars['pottwal.n39.eu']['grafana_admin_password'] }}" + url_password: > + "{{ hostvars['pottwal.n39.eu']['grafana_admin_password'] }}" name: "{{ item.name }}" email: "{{ item.email }}" login: "{{ item.login }}" @@ -14,18 +15,3 @@ is_admin: true state: present loop: "{{ grafana_users }}" - - - name: Create influxdb datasource - community.grafana.grafana_datasource: - name: "datasource-influxdb" - url: "https://{{ hostvars['pottwal.n39.eu']['grafana_domain_name'] }}" - url_username: admin - url_password: "{{ hostvars['pottwal.n39.eu']['grafana_admin_password'] }}" - org_id: "1" - ds_type: "influxdb" - ds_url: "https://{{ hostvars['pottwal.n39.eu']['influxdb_domain_name'] }}:8086" - database: "{{ item.database }}" - user: "{{ item.user }}" - password: "{{ item.password }}" - time_interval: ">10s" - loop: "{{ grafana_datasources }}" \ No newline at end of file diff --git a/host_vars/localhost/vars.yml b/host_vars/localhost/vars.yml index 20ccd5d..cd3c13d 100644 --- a/host_vars/localhost/vars.yml +++ b/host_vars/localhost/vars.yml @@ -3,8 +3,3 @@ grafana_users: email: accounts+grafana@netz39.de login: netz39 password: "{{ vault_grafana_user_password }}" - -grafana_datasources: - - database: "power_usage" - user: "grafana" - password: "{{ vault_influx_user_pasword }}" \ No newline at end of file diff --git a/host_vars/localhost/vault b/host_vars/localhost/vault index b66a087..540574d 100644 --- a/host_vars/localhost/vault +++ b/host_vars/localhost/vault @@ -1,10 +1,7 @@ $ANSIBLE_VAULT;1.1;AES256 -63656563373764373039316666323737643030646338353161383534333266363663346537353465 -3966323233643737393035643461663533373230656232360a626165653365386339376563303531 -38643864353234663839326631633634303233353736393631303834343839363831616132636565 -6462353664653130620a306435303963643663303363653738616535386465623336666538626161 -30383732393464313139343464626131303464393564333865633861303136363035623534656435 -37376636663564666234636164623339383136653565366432343762396138663763356330383832 -62386363326164363165373265623863323634363538626132366132616135646332366133323535 -39633831616463633637636362623733303039313666666662616666383232656231653363643538 -3864 +66303836663730383331396265363534666661326163643634306332613038653530333333326236 +3163343062656262363364373561646163623666623738620a373039353861306261643435346330 +64333139336536346130646435393235643838356634636233363035306437353230333864346437 +6562366564373461380a393265656437303531396234613266383334373762646536643733323565 +61366261303965316263303434313462656661666530636662306633663336316462303339633531 +3832643731646535306562326162363864646338343165633834 diff --git a/requirements.yml b/requirements.yml index b8259ae..a733ef5 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,13 +1,16 @@ --- -- src: hifis.unattended_upgrades - version: v1.12.2 -- src: git+https://github.com/adriagalin/ansible.timezone.git - version: 3.0.0 -- src: git+https://github.com/24367dfa/ansible-role-dehydrated.git - version: 1.0.3 -- src: penguineer.dehydrated_cron - version: v1.0.0 -- src: git+https://github.com/maz3max/ble-keykeeper-role.git - version: v1.1.0 -- src: community.grafana - version: 1.5.3 +roles: + - src: hifis.unattended_upgrades + version: v1.12.2 + - src: git+https://github.com/adriagalin/ansible.timezone.git + version: 3.0.0 + - src: git+https://github.com/24367dfa/ansible-role-dehydrated.git + version: 1.0.3 + - src: penguineer.dehydrated_cron + version: v1.0.0 + - src: git+https://github.com/maz3max/ble-keykeeper-role.git + version: v1.1.0 + +collections: + - name: community.grafana + version: 1.5.3