From 74ab59c4f33d534cfbca4055c1f494a670be40e2 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 26 Sep 2019 12:56:10 -0400 Subject: [PATCH] ceph-dashboard: Add prometheus api host The set-prometheus-api-host ceph dashboard subcommand was missing in ceph-dashboard role. Only grafana and alermanager were present. This commit also remove the trailing slash at the end of the host/url values. Closes: #4453 Signed-off-by: Dimitri Savineau --- roles/ceph-dashboard/tasks/configure_dashboard.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml index caad13935..03f77c53c 100644 --- a/roles/ceph-dashboard/tasks/configure_dashboard.yml +++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml @@ -101,13 +101,19 @@ until: ac_result.rc == 0 - name: set grafana url - command: "{{ container_exec_cmd }} ceph dashboard set-grafana-api-url {{ dashboard_protocol }}://{{ grafana_server_addr }}:{{ grafana_port }}/" + command: "{{ container_exec_cmd }} ceph dashboard set-grafana-api-url {{ dashboard_protocol }}://{{ grafana_server_addr }}:{{ grafana_port }}" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true changed_when: false - name: set alertmanager host - command: "{{ container_exec_cmd }} ceph dashboard set-alertmanager-api-host {{ dashboard_protocol }}://{{ grafana_server_addr }}:{{ alertmanager_port }}/" + command: "{{ container_exec_cmd }} ceph dashboard set-alertmanager-api-host {{ dashboard_protocol }}://{{ grafana_server_addr }}:{{ alertmanager_port }}" + delegate_to: "{{ groups[mon_group_name][0] }}" + run_once: true + changed_when: false + +- name: set prometheus host + command: "{{ container_exec_cmd }} ceph dashboard set-prometheus-api-host {{ dashboard_protocol }}://{{ grafana_server_addr }}:{{ prometheus_port }}" delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true changed_when: false