From 1746def8c7b64ca15b3bf32587dcab29a1a39582 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 3 Sep 2019 14:16:34 -0400 Subject: [PATCH] group_vars: remove useless dashboard files The only useful ansible group for the grafana/prometheus stack is grafana-server so no one of those files are actually needed. The default values for all dashboard roles are present in ceph-defaults role so it's also present in in group_vars/all.yml. Signed-off-by: Dimitri Savineau (cherry picked from commit ec56a95013efef59c591310cc16f3037cdaba255) --- group_vars/dashboards.yml.sample | 21 --------------------- group_vars/grafanas.yml.sample | 26 -------------------------- group_vars/node-exporters.yml.sample | 11 ----------- group_vars/prometheuss.yml.sample | 26 -------------------------- 4 files changed, 84 deletions(-) delete mode 100644 group_vars/dashboards.yml.sample delete mode 100644 group_vars/grafanas.yml.sample delete mode 100644 group_vars/node-exporters.yml.sample delete mode 100644 group_vars/prometheuss.yml.sample diff --git a/group_vars/dashboards.yml.sample b/group_vars/dashboards.yml.sample deleted file mode 100644 index 44c48f1f5..000000000 --- a/group_vars/dashboards.yml.sample +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -#dashboard_admin_user: admin -#dashboard_admin_password: admin -# We only need this for SSL (https) connections -#dashboard_crt: '' -#dashboard_key: '' -#dashboard_rgw_api_user_id: ceph-dashboard -#dashboard_rgw_api_host: '' -#dashboard_rgw_api_port: '' -#dashboard_rgw_api_scheme: '' -#dashboard_rgw_api_admin_resource: '' -#dashboard_rgw_api_no_ssl_verify: False -#grafana_server_group_name: grafana-server diff --git a/group_vars/grafanas.yml.sample b/group_vars/grafanas.yml.sample deleted file mode 100644 index 5d4ddbe13..000000000 --- a/group_vars/grafanas.yml.sample +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -#grafana_admin_user: admin -#grafana_admin_password: admin -# We only need this for SSL (https) connections -#grafana_crt: '' -#grafana_key: '' -#grafana_container_image: "grafana/grafana:latest" -#grafana_container_cpu_period: 100000 -#grafana_container_cpu_cores: 2 -# container_memory is in GB -#grafana_container_memory: 4 -#grafana_uid: 472 -#grafana_datasource: Dashboard -#grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard" -#grafana_plugins: -# - vonage-status-panel -# - grafana-piechart-panel - diff --git a/group_vars/node-exporters.yml.sample b/group_vars/node-exporters.yml.sample deleted file mode 100644 index 7171d59aa..000000000 --- a/group_vars/node-exporters.yml.sample +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -#node_exporter_container_image: prom/node-exporter:latest - diff --git a/group_vars/prometheuss.yml.sample b/group_vars/prometheuss.yml.sample deleted file mode 100644 index 7330a8ef7..000000000 --- a/group_vars/prometheuss.yml.sample +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -#prometheus_container_image: prom/prometheus:latest -#prometheus_container_cpu_period: 100000 -#prometheus_container_cpu_cores: 2 -# container_memory is in GB -#prometheus_container_memory: 4 -#prometheus_data_dir: /var/lib/prometheus -#prometheus_conf_dir: /etc/prometheus -#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image - -#alertmanager_container_image: prom/alertmanager:latest -#alertmanager_container_cpu_period: 100000 -#alertmanager_container_cpu_cores: 2 -# container_memory is in GB -#alertmanager_container_memory: 4 -#alertmanager_data_dir: /var/lib/alertmanager -#alertmanager_conf_dir: /etc/alertmanager -