diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-06-25 01:37:52 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-06-25 01:37:52 +0200 |
| commit | 51090aa083e7e7b9c5b3bf78e59cf4d3e9696871 (patch) | |
| tree | ce99677dd746dfc8c30692d2d524ce77cc7d40ea | |
| parent | move monitoring web interfaces into common nginx vhost (diff) | |
grafana: drop some settings
| -rw-r--r-- | inventory/host_vars/ch-mon.yml | 9 | ||||
| -rw-r--r-- | roles/monitoring/grafana/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/monitoring/grafana/tasks/main.yml | 22 |
3 files changed, 0 insertions, 34 deletions
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml index 118e7f0b..4df29b23 100644 --- a/inventory/host_vars/ch-mon.yml +++ b/inventory/host_vars/ch-mon.yml @@ -85,12 +85,3 @@ prometheus_alertmanager_web_route_prefix: /alertmanager/ grafana_secret_key: "{{ vault_grafana_secret_key }}" - -grafana_config_smtp: - enabled: true - host: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ipaddr('address') }}:25" - from_name: "chaos@home Grafana" - from_address: "noreply@chaos-at-home.org" - -grafana_config_plugins: - enable_alpha: true diff --git a/roles/monitoring/grafana/defaults/main.yml b/roles/monitoring/grafana/defaults/main.yml index 0118b8cb..8798dfb5 100644 --- a/roles/monitoring/grafana/defaults/main.yml +++ b/roles/monitoring/grafana/defaults/main.yml @@ -19,6 +19,3 @@ grafana_config_security: grafana_config_users: allow_sign_up: false allow_org_create: false - -grafana_config_smtp: {} -grafana_config_plugins: {} diff --git a/roles/monitoring/grafana/tasks/main.yml b/roles/monitoring/grafana/tasks/main.yml index 8698c036..61dd8638 100644 --- a/roles/monitoring/grafana/tasks/main.yml +++ b/roles/monitoring/grafana/tasks/main.yml @@ -52,28 +52,6 @@ value: "{{ item.value | string }}" notify: restart grafana -- name: configure grafana smtp - loop: "{{ grafana_config_smtp | dict2items }}" - loop_control: - label: "{{ item.key }}" - ini_file: - path: /etc/grafana/grafana.ini - section: smtp - option: "{{ item.key }}" - value: "{{ item.value | string }}" - notify: restart grafana - -- name: configure grafana plugins - loop: "{{ grafana_config_plugins | dict2items }}" - loop_control: - label: "{{ item.key }}" - ini_file: - path: /etc/grafana/grafana.ini - section: plugins - option: "{{ item.key }}" - value: "{{ item.value | string }}" - notify: restart grafana - - name: make sure grafan-server is enabled and started systemd: name: grafana-server |