~zzehring/charm-grafana:bugfix/lp1822691-multiple-ceph-exporter-dashes

Last commit made on 2020-04-29
Get this branch:
git clone -b bugfix/lp1822691-multiple-ceph-exporter-dashes https://git.launchpad.net/~zzehring/charm-grafana
Only Zachary Zehring can upload to this branch. If you are Zachary Zehring please log in for upload directions.

Branch merges

Branch information

Name:
bugfix/lp1822691-multiple-ceph-exporter-dashes
Repository:
lp:~zzehring/charm-grafana

Recent commits

17de06d... by Zachary Zehring

Add ability to display multiple prometheus-ceph-exporter clusters in ceph dashboards.

This change allows for multiple prometheus-ceph-exporter charms to exist in a cloud
by using nested variables in grafana dashboards. An additional templating item is added
to the list for grabbing the job labels from the corresponding ceph metrics. Then, this
can be passed to any other variables (for example, ceph_osd_in) to allow the selection
of the Exporter to filter osds based on what job (exporter) it's assigned to. For all
query expressions, a filter based one what job has been selected has been added.

af1771e... by Joe Guo

Fix get_admin_password action

1. add @when('grafana.admin_password.set') decorator to configure_sources.

This will ensure `configure_sources` always run after `check_adminuser` and
admin_password is either configured or generated.

2. change get_admin_password logic order: read from config first, fall back to kv if not set.

The unitdata.kv() grafana.admin_password value is created as a fallback when
admin_password is not set in the juju config. The original logic is opposite.
Simplify code by the way.

3. reuse get_admin_password in configure_sources
since the logic is the same now

LP: #1835093

Reviewed-on: https://code.launchpad.net/~guoqiao/charm-grafana/+git/charm-grafana/+merge/381018
Reviewed-by: Jeremy Lounder <email address hidden>
Reviewed-by: Giuseppe Petralia <email address hidden>

8dffaef... by Joe Guo

Fix get_admin_password action

1. add @when('grafana.admin_password.set') decorator to configure_sources.

This will ensure `configure_sources` always run after `check_adminuser` and
admin_password is either configured or generated.

2. change get_admin_password logic order: read from config first, fall back to kv if not set.

The unitdata.kv() grafana.admin_password value is created as a fallback when
admin_password is not set in the juju config. The original logic is opposite.
Simplify code by the way.

3. reuse get_admin_password in configure_sources
since the logic is the same now

LP: #1835093

Signed-off-by: Joe Guo <email address hidden>

fa5363e... by Jeremy Lounder

Merge ibranch '1685179-hardcoded-org-id'

996baf3... by Joe Guo

improve hook for install_file changed

Compare version to install with local installed version.
If downgrade, block.

LP: #1702957

Reviewed-on: https://code.launchpad.net/~guoqiao/charm-grafana/+git/charm-grafana/+merge/380873
Reviewed-by: Jeremy Lounder <email address hidden>
Reviewed-by: David O Neill <email address hidden>

222b45c... by Joe Guo

add unit tests and update Makefile

Signed-off-by: Joe Guo <email address hidden>

3f50754... by Joe Guo

reactive/grafana.py: compare versions while install_file changed

Compare version to install with local installed version. If downgrade, block.

LP: #1702957

Signed-off-by: Joe Guo <email address hidden>

ada7d17... by Joe Guo

lib/charms/layer/grafana.py: add util functions

Signed-off-by: Joe Guo <email address hidden>

8a128ed... by Joe Guo

trigger backup configure for upgrade-charm

in upgrade-charm hook, remove flag `granfana.backup.configured`.
So the `setup_backup_schedule` func will be triggerd to update `dashboard_backup` script.

LP: #1747937

Reviewed-on: https://code.launchpad.net/~guoqiao/charm-grafana/+git/charm-grafana/+merge/380930
Reviewed-by: Paul Goins <email address hidden>
Reviewed-by: Jose Guedez <email address hidden>

4803c63... by Joe Guo

get org id from api instead of hardcode

Signed-off-by: Joe Guo <email address hidden>