openstack/kayobe
Code Issues Proposed changes

Organise and update grafana-conf role variables

Browse Source
This commit is contained in:
Doug Szumski 2018-01-23 12:12:00 +00:00
parent b191dc70d8
commit 50d324d8a3
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ansible/group_vars/all/grafana
View File

@ -10,8 +10,15 @@ grafana_local_admin_user_name: "grafana_admin"
# https://github.com/stackhpc/grafana-reference-dashboards.git
grafana_monitoring_node_dashboard_repo:
# Dashboard repo version. Optional, defaults to 'HEAD'.
grafana_monitoring_node_dashboard_repo_version:
# Path to which Grafana dashboards will be cloned to a monitoring node
grafana_monitoring_node_dashboard_repo_path: "{{ source_checkout_path ~ '/grafana' }}"
grafana_monitoring_node_dashboard_repo_checkout_path: "{{ source_checkout_path ~ '/grafana-dashboards' }}"
# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
# containing the dashboards. Eg. /prometheus/control_plane
grafana_monitoring_node_dashboard_repo_path:
# The Grafana organisation for the control plane. Note that for Monasca
# Grafana with domain support the format is:
@ -35,8 +42,4 @@ grafana_control_plane_organisation: "control_plane"
#
grafana_datasources: {}
# The path, relative to the grafana_monitoring_node_dashboard_repo_path
# containing the dashboards. Eg. /prometheus/control_plane
grafana_monitoring_node_dashboard_path:
###############################################################################

7
ansible/overcloud-grafana-configure.yml
View File

@ -33,8 +33,9 @@
grafana_conf_grafana_admin_user: "{{ grafana_local_admin_user_name }}"
grafana_conf_grafana_admin_pass: "{{ grafana_admin_password }}"
grafana_conf_grafana_dashboard_repo:
path: "{{ grafana_monitoring_node_dashboard_repo }}"
checkout_path: "{{ grafana_monitoring_node_dashboard_repo_path }}"
relative_path: "{{ grafana_monitoring_node_dashboard_path }}"
repo: "{{ grafana_monitoring_node_dashboard_repo }}"
version: "{{ grafana_monitoring_node_dashboard_repo_version }}"
checkout_path: "{{ grafana_monitoring_node_dashboard_repo_checkout_path }}"
relative_path: "{{ grafana_monitoring_node_dashboard_repo_path }}"
grafana_conf_grafana_url: "http://{{ kolla_internal_vip_address }}:3000"
grafana_conf_grafana_datasources: "{{ grafana_datasources }}"

15
etc/kayobe/grafana.yml
View File

@ -10,7 +10,14 @@
# https://github.com/stackhpc/grafana-reference-dashboards.git
#grafana_monitoring_node_dashboard_repo:
# Dashboard repo version. Optional, defaults to 'HEAD'.
#grafana_monitoring_node_dashboard_repo_version:
# Path to which Grafana dashboards will be cloned to a monitoring node
#grafana_monitoring_node_dashboard_repo_checkout_path:
# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
# containing the dashboards. Eg. /prometheus/control_plane
#grafana_monitoring_node_dashboard_repo_path:
# The Grafana organisation for the control plane. Note that for Monasca
@ -18,8 +25,8 @@
# organisation_name@openstack_domain
#grafana_control_plane_organisation:
# A list of datasources to configure. See the stackhpc.grafana-conf role
# for a list of supported datasources. Example:
# A dict of datasources to configure. See the stackhpc.grafana-conf role
# for all supported datasources. Example:
#
# grafana_datasources:
# monasca_api:
@ -35,10 +42,6 @@
#
#grafana_datasources:
# The path, relative to the grafana_monitoring_node_dashboard_repo_path
# containing the dashboards. Eg. /prometheus/control_plane
#grafana_monitoring_node_dashboard_path:
###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes