Merge ~cjohnston/charm-prometheus2:doc-tweaks into charm-prometheus2:master

Proposed by Chris Johnston
Status: Merged
Approved by: Eric Chen
Approved revision: 660df4a7464c2de808cd706aaaf80a8504d607ec
Merged at revision: 4c824e138bdc0f7b03f5ff4e562e58c8e654db9b
Proposed branch: ~cjohnston/charm-prometheus2:doc-tweaks
Merge into: charm-prometheus2:master
Diff against target: 21 lines (+2/-1)
1 file modified
src/config.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+443139@code.launchpad.net

Commit message

Clarify config description of rules-repo and rules-update-ssh-key.

Fixes: LP: #2018932, #2018933

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 :
review: Approve (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 4c824e138bdc0f7b03f5ff4e562e58c8e654db9b

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/config.yaml b/src/config.yaml
2index cbfaf8d..01bd9e8 100644
3--- a/src/config.yaml
4+++ b/src/config.yaml
5@@ -148,7 +148,7 @@ options:
6 rules-repo:
7 type: string
8 description: |
9- Git repository with custom rules. Rules have to be in *.rules files
10+ Git repository with custom rules. Rules have to be in *.yaml, *.yml, or *.rules files
11 default: ""
12 rules-repo-branch:
13 type: string
14@@ -166,6 +166,7 @@ options:
15 type: string
16 description: |
17 Plain text private SSH key used to for git authentication.
18+ Example: juju config prometheus2 rules-update-ssh-key=@private_ssh_key_file
19 Also see "rules-repo" config option
20 default: ""
21 rules-update-notify-email:

Subscribers

People subscribed via source and target branches

to all changes: