Move grafana secret group vars to the dedicated group folder

group_vars/grafana/vars.yml

@@ -45,9 +45,10 @@ grafana_users:
 
 grafana_security:
   admin_user: admin
-  admin_password: "{{ grafana_auth_admin_password }}"
+  admin_password: "{{ vault_grafana_auth_admin_password }}"
   allow_embedding: "true"
   cookie_secure: "true"
+grafana_security_secret_key: "{{ vault_grafana_security_secret_key }}"
 
 grafana_auth:
   anonymous:
@@ -58,13 +59,14 @@ grafana_auth:
   github:
     enabled: "true"
     allow_sign_up: "true"
-    client_id: "{{ grafana_auth__github_client_id }}"
-    client_secret: "{{ grafana_auth__github_client_secret }}"
+    client_id: "{{ vault_grafana_auth__github_client_id }}"
+    client_secret: "{{ vault_grafana_auth__github_client_secret }}"
     scopes: "user:email,read:org"
     auth_url: "https://github.com/login/oauth/authorize"
     token_url: "https://github.com/login/oauth/access_token"
     api_url: "https://api.github.com/user"
     allowed_organisations: "usegalaxy.eu galaxyproject"
+grafana_auth_admin_password: "{{ vault_grafana_auth_admin_password }}"
 
 grafana_image_storage:
   provider: local
@@ -191,9 +193,9 @@ telegraf_plugins_extra:
 
 #galaxy_test_url: https://usegalaxy.eu
 #galaxy_test_user:
-    #api_key: "{{ galaxy_test_user__api_key }}"
+    #api_key: "{{ vault_galaxy_test_user__api_key }}"
     #username: [email protected]
-    #password: "{{ galaxy_test_user__password }}"
+    #password: "{{ vault_galaxy_test_user__password }}"
     #handlers:
         #- "handler0"
         #- "handler1"
@@ -242,11 +244,16 @@ galaxy_nagios_urls:
 # Grafana Gitter Bridge
 ggb_create_user: true
 ggb_create_group: true
+bridge_token: "{{ vault_grafana_gitter_bridge_token }}"
+gitter_auth_token: "{{ vault_grafana_gitter_bridge_auth_token }}"
+gitter_room_id: "{{ vault_grafana_gitter_room_id }}"
 
 # Grafana Matrix Forwarder
 grafana_matrix_forwarder_version: "0.6.0"
 grafana_matrix_forwarder_user: centos
 grafana_matrix_forwarder_group: centos
 grafana_matrix_forwarder_homeserver: https://matrix-client.matrix.org
 grafana_matrix_forwarder_port: 6000
+grafana_matrix_forwarder_username: "{{ vault_grafana_matrix_forwarder_username }}"
+grafana_matrix_forwarder_password: "{{ vault_grafana_matrix_forwarder_password }}"
 grafana_matrix_forwarder_resolve_mode: reaction

group_vars/grafana/vault.yml

@@ -0,0 +1,45 @@
+$ANSIBLE_VAULT;1.1;AES256
+39343831343338376266646363366538353237663739613935326238663230663964303738343936
+6230383739373939653363396266656135353338656265300a393934656132343233303361306262
+32616637656232333736333930353633393931666665636337326232306563303166653864343730
+3231363731623736610a636235666461633663306337353533613534333566306539666261383161
+32653663336131656363386632333739353237303138343866336337323066313962393238306438
+33326434386264663830663734326466613561343132666538623636303431626133653265393030
+33393962353032666263343566313236626138353835646262353662373338613731373563333063
+64633036373837666262616564343533623666366433313163666362663865663062373235636137
+38616631333632393662386535366264313934666664616164633430353865393765656236393332
+31616330393438333062396636656563343333313636623833356131656135383935346561393939
+61376539633164636561616165343865353636366166613536383036363630653362306435306165
+35653965346363383865343633303739346339336138343735613536316363623631316433633662
+37643265323735626234653538656532626336366230396166343039656635336633633730316463
+30323237346231333663323061356131646339343961336164636635393133386530376239303437
+61303531646433316562373863656362316139306237646339333439316235303934363031323164
+64303035343031353739323864623963356363393633346563373662373563626531633032666531
+31613730663036313431373738656430376337313930656163383437666133356466623065363264
+39373736343862653666323537323137326331386334303139343964373331353134613238303839
+62326437323633383036613038333038633139653264313464623263316536326539663933396331
+61353738366237353931393135663633303034343930643765316635663833323630656137366639
+38623831346330363837306338343938643735633130623437623032383339303561636631353333
+65343730633535316430663334323031303864383834643830663632646366356338613330313334
+65646539643633656131303265396462393462636333653230353466393964643031313033616331
+34626562353638333839616464323432326664373562356131633638353337383761393930366463
+32343735616334366637343535623037373231643538633430323130626332373537376265343666
+32333138326534333266356164393164366563666632346461346639633964643632643864376663
+30343332323230376530636561373666613163316332396438636234316665303766396432323635
+37393161386265393639653532666237616165616662303536373061383166633031336330636234
+32663031636138353266653033323030666635316133356161623934353661383638643963656234
+65393333343532623866643064306363653161643032646262363037626239633635343830383133
+62303761633830303733623661613532663633303431626138656264306663353563633863333938
+65396430633465386130383630333963313438666335323834616566323366386430356435323765
+36633863323337616639373133653436333838653461633864303130653365643632376533386263
+34383933303734366131373665386362626236663063616564383461643438393237623133303035
+31616232343536373438316234636332333566346263336431643936653037613837363235336564
+30363130636539326566633634383164353538383033333436633639303533663361623262633063
+64353663373965613963666334666166346234636461656166663863613733303061646664643631
+64653562353738323935303737306164386332343062616462373133303266376466373830616539
+63613639323631653461616334663130346535636436643166353331333832386266363531363765
+64653364653339653565613738613631383738346566316631613365656666396363326362306563
+38303735386566643163353661623865323934646363303336343438366464303837633966393164
+33323866393132303037613163356335366262363664333435633139376130346562373661613536
+38633561343931393061363830623935343534643062643963353762633665616661633763663434
+66386237656138383261