Prometheus Alertmanager Charm

Merge ~cjohnston/charm-prometheus-alertmanager:lp1891101 into charm-prometheus-alertmanager:master

  1. Git
  2. lp:~cjohnston/charm-prometheus-alertmanager
  3. lp1891101
  4. Merge into master
Proposed by Chris Johnston
Status: Merged
Approved by: James Troup
Approved revision: 5f7ebe445aa96006c048acb676c287e4b7cc4294
Merged at revision: 5da5970711164ca7bcb6982093b289051db783dd
Proposed branch: ~cjohnston/charm-prometheus-alertmanager:lp1891101
Merge into: charm-prometheus-alertmanager:master
Diff against target: 30 lines (+4/-4)
1 file modified
src/README.md (+4/-4)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+415469@code.launchpad.net

Commit message

Cleanup readme.

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

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 :

PASSED: Continuous integration, rev:2f50462cf0d4bc727ad4cb47343a5a691f5c2278
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-alertmanager-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/268/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/964/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-alertmanager-ci/2//rebuild

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

Change successfully merged at revision 5da5970711164ca7bcb6982093b289051db783dd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/README.md b/src/README.md
2index d1c1759..ba2628b 100644
3--- a/src/README.md
4+++ b/src/README.md
5@@ -1,8 +1,8 @@
6 # Juju prometheus alertmanager charm
7
8-This charm provides the [Prometheus alertmanager](https://github.com/prometheus/alertmanager), part of the [Prometheus](https://prometheus.io/) monitoring system
9+This charm provides the [Prometheus alertmanager](https://github.com/prometheus/alertmanager), part of the [Prometheus](https://prometheus.io/) monitoring system.
10
11-The charm should be realted to the prometheus charm
12+The charm should be related to the prometheus charm.
13
14 ## Configuration
15
16@@ -11,7 +11,7 @@ Common configuration options are:
17 * external_url
18 * repeat_interval
19
20-The charm supports many differnet notification mechanisms. For example
21+The charm supports many different notification mechanisms. For example,
22 to enable email notifications set the following options:
23
24 * smtp_smarthost
25@@ -23,4 +23,4 @@ To send notifications to PagerDuty set:
26 * pagerduty_service_key
27
28 For more information about supported notification methods and other
29-configuration options refer to the config.yaml help
30+configuration options refer to the config.yaml help.

Subscribers

People subscribed via source and target branches

to all changes: