~sudeephb/charm-grafana:22.10

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 78bec2e54309dfa697da47beb8a057483459e698

🤖 prod-jenkaas-bootstack: Approve (continuous-integration) on 2022-09-22

Robert Gildein: Approve on 2022-09-22

Eric Chen: Approve on 2022-09-22

BootStack Reviewers: Pending requested 2022-09-14

Diff: 108 lines (+13/-24)

4 files modified

src/README.md (+3/-21)
src/metadata.yaml (+3/-3)
src/tests/functional/requirements.txt (+1/-0)
src/tests/functional/tests/test_grafana.py (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

c855750... by Sudeep Bhandari on 2022-09-22

Applied suggestions

20b5a45... by Sudeep Bhandari on 2022-09-22

Added retries in some functional tests

9d6352f... by Sudeep Bhandari on 2022-09-14

Minor fixes in Readme and metadata.yaml

22ccaf7... by Mustafa Kemal Gilor on 2022-08-16

dashboards_backup script compatibility update for Grafana version >=8:

The dashboards_backup script was using Slug API for retrieving the
dashboards, which is deprecated in Grafana version '5.4.0' in favor
of UID API, and removed in version '8.0.0'. Due to that, the backup
script was failing to generate backups in version 8.0.0 and above.

This fix introduces an API switch mechanism between Slug API and
UID API, which allows the script to behave as before for Grafana
(< 8.0.0) and use UID API for Grafana version (>= 8.0.0).

Fixes LP issue #1983814

Reviewed-on: https://code.launchpad.net/~mustafakemalgilor/charm-grafana/+git/charm-grafana/+merge/428028
Reviewed-by: Giuseppe Petralia <email address hidden>
Reviewed-by: Robert Gildein <email address hidden>

705dbcf... by Mustafa Kemal Gilor on 2022-08-09

dashboard_backup compat update (2):

Added unit tests for dashboards_backup script, made linter & formatter happy

d27d80c... by Mustafa Kemal Gilor on 2022-08-08

dashboards_backup script compatibility update for grafana version >=8:

The dashboards_backup script was using Slug API for retrieving the
dashboards, which is deprecated in Grafana version '5.4.0' in favor
of UID API, and removed in version '8.0.0'. Due to that, the backup
script was failing to generate backups in version 8.0.0 and above.

This fix introduces an API switch mechanism between Slug API and
UID API, which allows script to behave as before for Grafana
(< 8.0.0) and use UID API for Grafana version (>= 8.0.0).

Fixes LP issue #1983814

29f5405... by Alvaro Uria on 2022-06-01

LP#1975622 LDAP config rendered non-string values with quotes

Reviewed-on: https://code.launchpad.net/~aluria/charm-grafana/+git/grafana-charm-1/+merge/423367
Reviewed-by: Peter Sabaini <email address hidden>

1c4d877... by Alvaro Uria on 2022-05-30

FIX: More than one FunctionalTestMarker dashboard

In order to test that upgraded telegraf charms propagate changes in the
dashboard templates to Grafana, the functional tests verify that a
single dashboard exists with the keyword "FunctionalTestMarker".
However, in recent changes, the template is now rendered twice (metrics
by application and metrics by host).

The assert on test_11_dashboard_upgrade now reflects "one or more"
instead of "one".

63062e9... by Alvaro Uria on 2022-05-25

LP#1975622 LDAP config rendered non-string values with quotes

692d0fc... by Xav Paice on 2022-03-14

Render ldap config owned by daemon user

    When installed as a snap, the LDAP config needs to be owned by root as
    the grafana user does not exist.

    Fixes-bug: LP: #1964725

Reviewed-on: https://code.launchpad.net/~xavpaice/charm-grafana/+git/grafana-charm/+merge/416778
Reviewed-by: James Troup <email address hidden>
Reviewed-by: 🤖 prod-jenkaas-bootstack <email address hidden>