From fc24b20259aef9fd0f6b74a0757992460eb2c53b Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 28 Oct 2021 00:26:39 +0200
Subject: configure auth for grafana

---
 chaos-at-home/host_vars/ch-mon.yml      | 41 +++++++++++++++++----------------
 inventory/host_vars/ch-mon.yml          |  4 ++++
 roles/monitoring/grafana/tasks/main.yml |  1 +
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/chaos-at-home/host_vars/ch-mon.yml b/chaos-at-home/host_vars/ch-mon.yml
index f39c68bb..f99a65e0 100644
--- a/chaos-at-home/host_vars/ch-mon.yml
+++ b/chaos-at-home/host_vars/ch-mon.yml
@@ -1,21 +1,22 @@
 $ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-61333038643439323235383539633861363663336261643338653763393062663063353531653234
-6266633364613634633636386432326162323038656138310a376532633332343937353633666238
-38633862376662393930373730633236353362333438646539326239643235396161623765303461
-3235653232636465390a643838656137346337626137356664353136313038386633366365396666
-38303566643562316134663634646135386536396362656366613466323166373962613333656534
-38353830303864363336343361393031306136633034366438376433326438343832363264653139
-38346662616533626539313365396130383966353635663436633731386365333363386431363734
-32393234303962643139646134653336323836316132616133383835613030323332323739393738
-34353461653261356362653133333638613064383465636330323665653262666136343163623566
-32366561633564393261343964313439626139353330316339653662613739343366666435336338
-61306635326236326565633532343466623532643234396134373435623563313566373037613362
-38353634313431643666623761393864656235653261653437376165353466396230633835333963
-62366333356565326363333235366538356663363139386334326330666262366633386136643561
-33373438396632393864396137626631623166343439333964323661313166613834363566666161
-65313965316361373937643832656435633330353065353461386565616464396566633565303265
-62333163386336363632316363653534383233383331343736396537313832613235373838643962
-32363436623533306361633162653831336261313230333662336462313332356135326232666138
-34623638343235666263326631303933643939636331366635363731613830626439333636376265
-37313534363633343538343938663434333562356631353636646138383435666132663336356534
-61663734663562663765
+31316166643039636238636530353563653637663735623261333138313938343833323737653563
+3935356464616163316464666562323536393034663963630a613932333038353761616531323666
+62633962666239626264656363323366663662356539623266336164663831613361326362326261
+6232613933303830610a363865383265336166346165613432316231666537386437313934323732
+39663166303662333763306536666561376136373638656362306234373136633837626265343162
+34376633306335383861373033343235316334663636633931656535373465613936333434666661
+38366666653665626133663439636332623131623532333537313835636230366261646361626136
+35313961316363656438373539383536623630343139343936306537666461616136613030356434
+30346231373861363939656430653236353864346133663363666636343536376133643538363235
+65633461363132613936316264333332383138653636613438396230343466656662643131356432
+36353731353336323361306132636338373831303932366432333434313438653930613939346366
+33663465633662633933303239633332633465326532363530373165346165656461656438393935
+66366166346230386535363435333632333130633532323336633834326535346338393830633534
+34393461326137663132663466613433623663333135386635363364333838626663303966326465
+64333136313035366362363965333633646634313364383730663934623533353163313033333864
+64643935663162616163643939386335336537663666666165663830353334353632613430386639
+33656231373362666331373038316631343030383335373538396430353732623036653366323062
+39386236333632316330343232363065613465663562623065376133373230313634383732623534
+34626436653435303733656561633638316264616334616463323031383734383230636632323234
+36366636363531306239373763656261346338393635666138313939613231363238303839383734
+66623537656235343563656335383438646636306533363836636665636335623164
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index eb0cea76..c6a5648f 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -72,6 +72,7 @@ prometheus_server_web_external_url: /prometheus/
 
 prometheus_server_auth_users:
   server: "{{ vault_prometheus_server_auth_user_passwords['server'] }}"
+  grafana: "{{ vault_prometheus_server_auth_user_passwords['grafana'] }}"
   admin: "{{ vault_prometheus_server_auth_user_passwords['admin'] }}"
 
 prometheus_server_selfscraping_auth:
@@ -149,6 +150,9 @@ grafana_datasources:
    type: "prometheus"
    access: "proxy"
    url: "http://127.0.0.1:9090/prometheus"
+   basicAuth: true
+   basicAuthUser: "grafana"
+   basicAuthPassword: "{{ vault_prometheus_server_auth_user_passwords['grafana'] }}"
    isDefault: yes
    jsonData:
      manageAlerts: no
diff --git a/roles/monitoring/grafana/tasks/main.yml b/roles/monitoring/grafana/tasks/main.yml
index 8b1db9c6..8194d717 100644
--- a/roles/monitoring/grafana/tasks/main.yml
+++ b/roles/monitoring/grafana/tasks/main.yml
@@ -62,6 +62,7 @@
       {{ {'datasources': grafana_datasources} | to_nice_yaml(indent=2) }}
     group: grafana
     mode: 0640
+  no_log: yes
   notify: restart grafana
 
 - name: install datasources
-- 
cgit v1.2.3