~zzehring/charm-grafana:feature/move-telegraf-dash-to-tele-charm

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 62a57a862c3de9fec4e2b51e152a9a700b58a7e7

James Hebden (community): Approve on 2020-07-21

Xav Paice (community): Needs Information on 2020-05-14

Diff: 2250 lines (+0/-2244)

1 file modified

dev/null (+0/-2244)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

f4c694a... by Zachary Zehring on 2020-05-04

Remove Telegraf dashboard template file.

af1771e... by Joe Guo on 2020-03-26

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 on 2020-03-23

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 on 2020-03-25

Merge ibranch '1685179-hardcoded-org-id'

996baf3... by Joe Guo on 2020-03-25

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 on 2020-03-24

add unit tests and update Makefile

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

3f50754... by Joe Guo on 2020-03-24

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 on 2020-03-24

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

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

8a128ed... by Joe Guo on 2020-03-23

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 on 2020-03-23

get org id from api instead of hardcode

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