Grafana Charm

Merge ~samuelallan/charm-grafana:grafana-install-source into charm-grafana:master

  1. Git
  2. lp:~samuelallan/charm-grafana
  3. grafana-install-source
  4. Merge into master
Proposed by Samuel Allan
Status: Superseded
Proposed branch: ~samuelallan/charm-grafana:grafana-install-source
Merge into: charm-grafana:master
Diff against target: 96 lines (+39/-39)
1 file modified
src/config.yaml (+39/-39)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Needs Fixing
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+450299@code.launchpad.net

This proposal has been superseded by a proposal from 2023-09-18.

Commit message

Update grafana install source

New signing key according to https://packages.grafana.com/ :

> The GPG keys previously used to sign the APT repository (fingerprint 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 0E22EB88E39E12277A7760AE9E439B102CF3C0C6) were rotated on 2023-01-12 and 2023-08-24 respectively, and replaced with a new key with fingerprint B53AE77BADB630A683046005963FA27710458545.

Blog post about the signing key rotation: https://grafana.com/blog/2023/08/24/grafana-security-update-gpg-signing-key-rotation/

New PPA url according to grafana docs: https://grafana.com/docs/grafana/latest/setup-grafana/installation/debian/

Closes-Bug: #2033568

Description of the change

Update grafana install source

New signing key according to https://packages.grafana.com/ :

> The GPG keys previously used to sign the APT repository (fingerprint 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 0E22EB88E39E12277A7760AE9E439B102CF3C0C6) were rotated on 2023-01-12 and 2023-08-24 respectively, and replaced with a new key with fingerprint B53AE77BADB630A683046005963FA27710458545.

Blog post about the signing key rotation: https://grafana.com/blog/2023/08/24/grafana-security-update-gpg-signing-key-rotation/

New PPA url according to grafana docs: https://grafana.com/docs/grafana/latest/setup-grafana/installation/debian/

Closes-Bug: #2033568

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:c51697764e9ecc9686d40cfb08b1ea555f0dafc9
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1687/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/474/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/4//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tianqi Xiao (txiao) wrote :

CI is failing due to a dependency issue in build stage:

:: ERROR: Some build dependencies for flit_scm<=1.7.0 from https://files.pythonhosted.org/packages/13/bd/1954d91d661a0f0bf1ef3893064350a22b3fdd9b15ef7091c97df13d76d7/flit_scm-1.6.1.tar.gz (from -r /root/snap/charmcraft/common/tmpa7m3tbtt/wheelhouse.txt (line 35)) conflict with the backend dependencies: tomli==2.0.1 is incompatible with tomli~=1.0.

The issue doesn't come from this MP because building on the master branch produces the same error.

Unmerged commits

c516977... by Samuel Allan

Update grafana install source

New signing key according to https://packages.grafana.com/ :

> The GPG keys previously used to sign the APT repository (fingerprint 4E40DDF6D76E284A4A6780E48C8C34C524098CB6 0E22EB88E39E12277A7760AE9E439B102CF3C0C6) were rotated on 2023-01-12 and 2023-08-24 respectively, and replaced with a new key with fingerprint B53AE77BADB630A683046005963FA27710458545.

Blog post about the signing key rotation: https://grafana.com/blog/2023/08/24/grafana-security-update-gpg-signing-key-rotation/

New PPA url according to grafana docs: https://grafana.com/docs/grafana/latest/setup-grafana/installation/debian/

Closes-Bug: #2033568

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/config.yaml b/src/config.yaml
index 03d330f..f8a9caa 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,7 +1,7 @@
1options:1options:
2 install_sources:2 install_sources:
3 default: |3 default: |
4 - 'deb https://packages.grafana.com/oss/deb stable main'4 - 'deb https://apt.grafana.com stable main'
5 type: string5 type: string
6 description: |6 description: |
7 YAML list of additional installation sources, as a string. The number of7 YAML list of additional installation sources, as a string. The number of
@@ -14,44 +14,44 @@ options:
14 - |14 - |
15 -----BEGIN PGP PUBLIC KEY BLOCK-----15 -----BEGIN PGP PUBLIC KEY BLOCK-----
1616
17 mQGNBGO4aiUBDAC82zo3vUyQH3yTCabQ7ZpospBg/xXBbJWbQNksIbEP/+I12CjB17 mQGNBGTnhmkBDADUE+SzjRRyitIm1siGxiHlIlnn6KO4C4GfEuV+PNzqxvwYO+1r
18 zac1QcMFd27MJlyXpsTqqSo1ZHOisNy0Tmyl/WlqMyoMeChg+LmIHLNbvAK0jPOX18 mcKlGDU0ugo8ohXruAOC77Kwc4keVGNU89BeHvrYbIftz/yxEneuPsCbGnbDMIyC
19 1Pt2OykXJWN9Ru+ZZ4uQNgdKO5nXS6CZtK+McfhRwwghp+vlZFJgqP6aGR2A4cZ719 k44UOetRtV9/59Gj5YjNqnsZCr+e5D/JfrHUJTTwKLv88A9eHKxskrlZr7Un7j3i
20 IJpUQIoT/8GY6Fdx5TStTJucVUXjSJ3VqafZe4c0WHrk5Yb0UptYPBj9brZkmC9F20 Ef3NChlOh2Zk9Wfk8IhAqMMTferU4iTIhQk+5fanShtXIuzBaxU3lkzFSG7VuAH4
21 Uz6BLX6eO0HGLdwvYzoenlN1sD/2dclUtxoKYmfKDgpcG1V4vOClYPgOZ7g6jvwU21 CBLPWitKRMn5oqXUE0FZbRYL/6Qz0Gt6YCJsZbaQ3Am7FCwWCp9+ZHbR9yU+bkK0
22 +nW39VGwR7yzbEAmGxVcd93QNUjTaZMfO3xJFm1UG5JwC6VJcd7Wp3hNHJle/y6222 Dts4PNx4Wr9CktHIvbypT4Lk2oJEPWjcCJQHqpPQZXbnclXRlK5Ea0NVpaQdGK+v
23 lw0N2AATqJ7AV6PXKBPNebXvCB0LqkAiC/W//imeMCk9hfREmb5rhf1s83owpJaQ23 JS4HGxFFjSkvTKAZYgwOk93qlpFeDML3TuSgWxuw4NIDitvewudnaWzfl9tDIoVS
24 gScEtJYIVgOqgGoFE8wkCkHFG1slneLykmGK2xAJ2Rk63MIAE4hL9WKLV624LMid24 Bb16nwJ8bMDzovC/RBE14rRKYtMLmBsRzGYHWd0NnX+FitAS9uURHuFxghv9GFPh
25 JqH3YIEA6pR+GlEAEQEAAbQmR3JhZmFuYSBMYWJzIDxlbmdpbmVlcmluZ0BncmFm25 eTaXvc4glM94HBUAEQEAAbQmR3JhZmFuYSBMYWJzIDxlbmdpbmVlcmluZ0BncmFm
26 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
54 =lSMJ54 =J9CI
55 -----END PGP PUBLIC KEY BLOCK-----55 -----END PGP PUBLIC KEY BLOCK-----
56 type: string56 type: string
57 description: |57 description: |

Subscribers

People subscribed via source and target branches

to all changes: