Merge dashboard-ansible code into ceph-ansible #3426

b-ranto · 2018-12-07T15:28:53Z

This PR merges the dashboard instllation code into ceph-ansible. The code only supports containerized deployment and the PR creates four new roles: ceph-grafana, ceph-dashboard, ceph-prometheus and ceph-node-exporter.

Edit (@zmc):
To-do:

leseb · 2018-12-07T15:56:17Z

roles/ceph-container-common/tasks/main.yml

 - name: include fetch_image.yml
  include_tasks: fetch_image.yml
  tags:
    - fetch_container_image
+  when: containerized_deployment


You're already in the ceph-container-common role which means you're doing containers already. You don't need this.

This is trickier. We only support containerized deployment in dashboard-ansible. I need to include this role to get docker installed even if ceph itself is not containerized. This allows me to do that.

leseb · 2018-12-07T15:56:22Z

roles/ceph-container-common/tasks/main.yml

@@ -31,10 +38,13 @@
  changed_when: false
  check_mode: no
  register: ceph_version
+  when: containerized_deployment


leseb · 2018-12-07T15:56:25Z

roles/ceph-container-common/tasks/main.yml


 - name: set_fact ceph_version ceph_version.stdout.split
  set_fact:
    ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"
+  when: containerized_deployment


roles/ceph-container-common/tasks/main.yml

roles/ceph-dashboard/tasks/configure_dashboard.yml

roles/ceph-grafana/tasks/main.yml

roles/ceph-node-exporter/handlers/main.yml

roles/ceph-node-exporter/tasks/main.yml

site.yml.sample

zmc · 2018-12-14T00:17:35Z

While @b-ranto is out, I'm taking over this work. I've addressed most, if not all, of the feedback items, as well as fixed several issues I noticed while testing it out. I do currently have a successful deployment, but there are some outstanding issues. I'll edit the initial comment on the PR with a task list, and push my updates.

A copy of the original branch is at zmc/wip-dashboard-branto, just to make sure I didn't destroy the original copy.

b-ranto · 2018-12-14T16:39:58Z

roles/ceph-grafana/files/dashboards/ceph-cluster.json

@@ -51,7 +51,7 @@
        "rgba(237, 129, 40, 0.9)",
        "rgb(255, 0, 0)"
      ],
-      "datasource": "$datasource",


FYI: This was intentional, with $datasource here, the datasource was actually selectable in grafana. We should probably drop the dashboards from the PR altogether and use those that are provided in ceph's ceph-grafana-dashboards package. Having them as part of the deployment was sort of a hack for luminous where these dashboards did not exist upstream, yet. Alternatively, we can have them as back-up in case the package does not exist (that was my original plan, the code should be ready for this, it just does not install the package, yet).

Oh, okay - it's just that none of the dashboards were working by default. I'll update the PR to use the packaged dashboards. It does look like they use a templated datasource name as well, so I'll see about fixing the default behavior.

I'd tentatively suggest that we shouldn't store them in two places, for maintenance reasons. It shouldn't be hard to backport the dashboards to luminous if we need to.

It was a downstream hack so we probably don't need to care about it upstream and we can just drop the dashboards and install the package instead. The official dashboard v2 support is dedicated for nautilus+.

It seems weird that they did not work, what error did you get? What grafana version were you using? Did you by any chance hit this bug? grafana/grafana#14239

It was/is v5.4.2 - I actually can't remember if it produced an error - the main symptom was blank graphs. Once I get the purge playbook working I'll tear down my current setup and dig a little deeper.

Update: I switched to using the packaged dashboards. It looks like the failure in datasource name templating only happens when visiting grafana directly without being signed in; once I logged in as admin, they worked properly. When viewing from the dashboard, they worked as well (even before signing in on the other grafana tab).

zmc · 2018-12-18T00:08:12Z

Looking at site-container.yml.sample and purge-docker-cluster.yml, I can't help but wish the various playbooks could share some code, and have access to var defaults. I wonder if it would ever make sense to move purge logic into relevant roles, and have their operation controlled by vars.

zmc · 2018-12-18T19:15:26Z

Dashboard: Ceph-Ansible deployment

roles/ceph-infra/tasks/configure_firewall.yml

roles/ceph-grafana/tasks/configure_grafana.yml

group_vars/all.yml.sample

zmc · 2019-01-30T00:05:58Z

Okay, I think this is ready to be merged. To fully tie everything together, it will require some changes to ceph's dashboard module, which is in-progress. When there's a PR for that, I'll link it here for posterity. It should be in the next day or so.

What it's going to do, is cause the dashboard to push the dashboard JSON files to Grafana when:

The dashboard module starts up
ceph dashboard update-grafana-dashboards is run
A POST request is sent to /api/grafana/update_dashboards

These should already be addressed.

guits · 2019-05-16T12:47:29Z

jenkins test dev-centos-container-dashboard

there is no need to add more complexity for this, let's use `containerized_deployment` in order to detect if we are running a containerized deployment. The idea is to use `container_exec_cmd` the same way we do in the rest of the playbook to run the different ceph commands needed to deploy the ceph-dashboard role. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

use site.yml to deploy ceph-container-common in order to install docker even in non-containerized deployments since there's no RPM available to deploy the differents applications needed for ceph-dashboard. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

use a block in grafana-server section to avoid duplicate condition. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

since stable-4.0 isn't to deploy ceph releases prior to nautilus, there's no need to add this complexity here. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

use `0440` instead of `0644` is enough Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

this file seems to be no longer used, let's remove it. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

generate all group_vars sample files corresponding to new roles added for ceph-dashboard implementation. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

make `dashboard_rgw_api_no_ssl_verify` a bool variable since it seems to be used as it. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

This commit aligns the way the different containers are managed with how it's currently done with the other ceph daemon. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

This commit add a new scenario to test the dashboard deployment via ceph-ansible. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

6f0643c introduced a typo, the role that should be run is ceph-container-common, not ceph-common Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

This commit renames the `docker_exec_cmd` variable to `container_exec_cmd` so it's more generic. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

guits · 2019-05-16T13:08:09Z

jenkins test dev-centos-non_container-dashboard

guits · 2019-05-16T13:08:20Z

jenkins test dev-centos-container-dashboard

There is no need to have default values for these variables in each roles since there is no corresponding host groups Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

guits · 2019-05-16T14:03:30Z

jenkins test dev-centos-container-dashboard

guits · 2019-05-16T14:03:38Z

jenkins test dev-centos-non_container-dashboard

b-ranto requested review from zmc, leseb and guits December 7, 2018 15:28

leseb added the DNM Do NOT merge label Dec 7, 2018

b-ranto force-pushed the wip-dashboard branch from e18ca5b to f9d043b Compare December 7, 2018 16:03

leseb previously requested changes Dec 7, 2018

View reviewed changes

b-ranto force-pushed the wip-dashboard branch from 5139dc7 to fd876f8 Compare December 7, 2018 16:54

zmc self-assigned this Dec 12, 2018

zmc force-pushed the wip-dashboard branch from fd876f8 to 6b871c9 Compare December 14, 2018 00:21

b-ranto commented Dec 14, 2018

View reviewed changes

zmc force-pushed the wip-dashboard branch 2 times, most recently from 252cd42 to ecb4650 Compare December 17, 2018 21:47

zmc force-pushed the wip-dashboard branch from ecb4650 to bf81347 Compare January 3, 2019 20:45

zmc force-pushed the wip-dashboard branch from 2aec6a4 to 868a99d Compare January 16, 2019 23:06

b-ranto commented Jan 17, 2019

View reviewed changes

zmc force-pushed the wip-dashboard branch 4 times, most recently from e88d5f7 to 537e58d Compare January 29, 2019 23:58

zmc changed the title ~~[DNM] Merge dashboard-ansible code into ceph-ansible~~ Merge dashboard-ansible code into ceph-ansible Jan 30, 2019

zmc force-pushed the wip-dashboard branch 2 times, most recently from bb7c663 to 447cb39 Compare February 12, 2019 20:53

b-ranto force-pushed the wip-dashboard branch 3 times, most recently from 70581a2 to eddd413 Compare February 14, 2019 19:17

guits approved these changes May 16, 2019

View reviewed changes

guits added 12 commits May 16, 2019 15:07

playbook: use blocks for grafana-server section

1e4da52

use a block in grafana-server section to avoid duplicate condition. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: simplify config-key command

4f754a0

since stable-4.0 isn't to deploy ceph releases prior to nautilus, there's no need to add this complexity here. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: set less permissive permissions on dashboard certificate/key

0b414f3

use `0440` instead of `0644` is enough Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: remove legacy file

296ee1a

this file seems to be no longer used, let's remove it. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: generate group_vars sample files

45dbf22

generate all group_vars sample files corresponding to new roles added for ceph-dashboard implementation. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: convert dashboard_rgw_api_no_ssl_verify to a bool

21633a3

make `dashboard_rgw_api_no_ssl_verify` a bool variable since it seems to be used as it. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: align the way containers are managed

af5c5d4

This commit aligns the way the different containers are managed with how it's currently done with the other ceph daemon. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

tests: add dashboard scenario testing

a2f305e

This commit add a new scenario to test the dashboard deployment via ceph-ansible. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

dashboard: fix a typo

c97a571

6f0643c introduced a typo, the role that should be run is ceph-container-common, not ceph-common Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

rename docker_exec_cmd variable

d63887c

This commit renames the `docker_exec_cmd` variable to `container_exec_cmd` so it's more generic. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

guits changed the title ~~Merge dashboard-ansible code into ceph-ansible~~ [skip ci] Merge dashboard-ansible code into ceph-ansible May 16, 2019

guits force-pushed the wip-dashboard branch from 3345a9a to d63887c Compare May 16, 2019 13:07

guits changed the title ~~[skip ci] Merge dashboard-ansible code into ceph-ansible~~ Merge dashboard-ansible code into ceph-ansible May 16, 2019

guits changed the title ~~Merge dashboard-ansible code into ceph-ansible~~ [skip ci] Merge dashboard-ansible code into ceph-ansible May 16, 2019

dsavineau approved these changes May 16, 2019

View reviewed changes

dashboard: move defaults variables to ceph-defaults

4a04090

There is no need to have default values for these variables in each roles since there is no corresponding host groups Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

guits changed the title ~~[skip ci] Merge dashboard-ansible code into ceph-ansible~~ Merge dashboard-ansible code into ceph-ansible May 16, 2019

guits removed the DNM Do NOT merge label May 16, 2019

guits merged commit 9f0d4d6 into master May 16, 2019

guits deleted the wip-dashboard branch May 16, 2019 14:39

mergify bot mentioned this pull request May 16, 2019

Automatic backport of pull request #3426 #3990

Merged

dsavineau mentioned this pull request Jul 31, 2019

lint: fix some lint errors #4291

Merged

Merge dashboard-ansible code into ceph-ansible #3426

Merge dashboard-ansible code into ceph-ansible #3426

b-ranto commented Dec 7, 2018 •

edited by guits

leseb Dec 7, 2018

b-ranto Dec 7, 2018

leseb Dec 7, 2018

leseb Dec 7, 2018

zmc commented Dec 14, 2018 •

edited

b-ranto Dec 14, 2018

zmc Dec 14, 2018

b-ranto Dec 14, 2018

zmc Dec 14, 2018

zmc Dec 17, 2018

zmc commented Dec 18, 2018

zmc commented Dec 18, 2018

zmc commented Jan 30, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

Merge dashboard-ansible code into ceph-ansible #3426

Merge dashboard-ansible code into ceph-ansible #3426

Conversation

b-ranto commented Dec 7, 2018 • edited by guits

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zmc commented Dec 14, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zmc commented Dec 18, 2018

zmc commented Dec 18, 2018

zmc commented Jan 30, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

guits commented May 16, 2019

b-ranto commented Dec 7, 2018 •

edited by guits

zmc commented Dec 14, 2018 •

edited