Browse Source

Move filters

Mateus Caruccio 6 years ago
parent
commit
09b3d046ec
1 changed files with 4 additions and 5 deletions
  1. 4 5
      roles/openshift_grafana/tasks/install_grafana.yaml

+ 4 - 5
roles/openshift_grafana/tasks/install_grafana.yaml

@@ -205,7 +205,6 @@
       status_code:
       - 200
     register: update_ds
-  - debug: var=update_ds
   when: add_ds.status == 409
 
 - name: Regex set data source name for openshift dashboard
@@ -243,7 +242,7 @@
   register: slurpfile
 
 - set_fact:
-    dashboard_data: '{{ slurpfile["content"] | b64decode | from_json | combine({ "dashboard": { "overwrite": true } }, recursive=True) }}'
+    dashboard_data: '{{ slurpfile["content"] | b64decode | from_json | combine({ "dashboard": { "overwrite": true } }, recursive=True) | to_json }}'
 
 - name: Add openshift dashboard
   uri:
@@ -251,7 +250,7 @@
     user: "{{ grafana_sa_token.stdout }}"
     validate_certs: false
     method: POST
-    body: '{{ dashboard_data | to_json }}'
+    body: '{{ dashboard_data }}'
     body_format: json
     status_code:
     - 200
@@ -266,7 +265,7 @@
   register: slurpfile
 
 - set_fact:
-    dashboard_data: '{{ slurpfile["content"] | b64decode | from_json | combine({ "dashboard": { "overwrite": true } }, recursive=True) }}'
+    dashboard_data: '{{ slurpfile["content"] | b64decode | from_json | combine({ "dashboard": { "overwrite": true } }, recursive=True) | to_json }}'
 
 - name: Add node exporter dashboard
   uri:
@@ -274,7 +273,7 @@
     user: "{{ grafana_sa_token.stdout }}"
     validate_certs: false
     method: POST
-    body: '{{ dashboard_data | to_json }}'
+    body: '{{ dashboard_data }}'
     body_format: json
     status_code:
     - 200