~aluria/charm-grafana:bug/1975622

Branch merges

Propose for merging

Merged into charm-grafana:master at revision 29f5405151e2450c34389336754f5c8697f492d7

Peter Sabaini (community): Approve on 2022-06-01

🤖 prod-jenkaas-bootstack: Needs Fixing (continuous-integration) on 2022-05-30

BootStack Reviewers: Pending requested 2022-05-25

Diff: 156 lines (+68/-19)

4 files modified

src/templates/ldap.toml.j2 (+4/-2)
src/tests/functional/tests/test_grafana.py (+1/-1)
src/tests/unit/test_grafana.py (+16/-16)
src/tests/unit/test_templates.py (+47/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

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>

d396f82... by Xav Paice on 2022-03-14

Reduce functests to a manageable set, with a smaller bundle.

Additionally improve Makefile and charmcraft.yaml.

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

5037302... 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

d00e005... by Xav Paice on 2022-03-13

reduce functest bundles

e742167... by Xav Paice on 2022-03-11

reduce test bundles for functests

65feea5... by Xav Paice on 2022-03-09

add clean to build step

5dd8ebb... by Xav Paice on 2022-03-09

update functest bundle options

f7fc26b... by Xav Paice on 2022-03-09

Remove Xenial support