Commit 9f64738e authored by Tobias Winchen's avatar Tobias Winchen
Browse files

Fix + simplify launch of sidecars and dashboard installation

parent 8ca734ac
......@@ -5,7 +5,10 @@ container_name: "{{ default_container_name }}"
edd_container: "{{ {} }}"
container_env: "{{ {} }}"
bind_port: "Not defined: Debug mode?"
redis_sidecar: False
launch_redis_sidecar: false
launch_influx_sidecar: true
install_dashboard: true # If true, no dashboard will be installed
dashboard_template: "common_dashboard.json"
dashboard_panels: ""
measurement: "{{ image_name }}"
......
......@@ -44,6 +44,10 @@
- name: Using Dashboard
block:
- name:
debug:
msg: "Dashoard template: {{ dashboard_template }}"
- name: "{{ image_name }}:: Setup dashboard"
uri:
url: "http://{{ grafana_host }}:{{ grafana_port }}/api/dashboards/db"
......@@ -75,7 +79,7 @@
- set_fact:
edd_container: '{{ edd_container | dict2items | rejectattr( "key", "equalto", container_name )|list|items2dict }}'
cacheable: true
when: dashboard_panels is defined or dashboard_template is defined
when: install_dashboard
- name: "{{ image_name }}:: Launch influx sidecar"
......@@ -88,7 +92,7 @@
exclude_sensors: "{% if influx_exclude_sensors is defined and influx_exclude_sensors%} {{ influx_exclude_sensors }} {% endif %}"
tags:
- always
when: dashboard_panels is defined or dashboard_template is defined or launch_influx_sidecar is defined and launch_influx_sidecar
when: launch_influx_sidecar
- name: "{{ image_name }}:: Launch redis sidecar"
......@@ -100,6 +104,6 @@
katcp_port: "{{ bind_port }}"
tags:
- always
when: launch_redis_sidecar is defined and launch_redis_sidecar
when: launch_redis_sidecar
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment