Telegraf Charm

Merge ~barryprice/charm-telegraf:prometheus-client-default-port-9103 into charm-telegraf:master

  1. Git
  2. lp:~barryprice/charm-telegraf
  3. prometheus-client-default-port-9103
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 4301b93a5a32f69485fcfd0a5b72cef78b9d503a
Merged at revision: dd5ef38292c09d7d2530d0521bf25c31934e4152
Proposed branch: ~barryprice/charm-telegraf:prometheus-client-default-port-9103
Merge into: charm-telegraf:master
Prerequisite: ~barryprice/charm-telegraf:split_prometheus_client_config
Diff against target: 19 lines (+2/-2)
1 file modified
src/tests/unit/test_telegraf.py (+2/-2)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
BootStack Reviewers Pending
Canonical IS Reviewers Pending
Review via email: mp+398220@code.launchpad.net

This proposal supersedes a proposal from 2021-02-18.

Commit message

when related with prometheus-client, if prometheus_output_port is unset, use :9103 by default instead of 9126

To post a comment you must log in.
Revision history for this message
Laurent Sesquès (sajoupa) wrote : Posted in a previous version of this proposal

pre-req MP: https://code.launchpad.net/~sajoupa/charm-telegraf/+git/telegraf-charm/+merge/397010

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : Posted in a previous version of this proposal

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Haw Loeung (hloeung) wrote : Posted in a previous version of this proposal

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : Posted in a previous version of this proposal

Change cannot be self approved, setting status to needs review.

Revision history for this message
Haw Loeung (hloeung) wrote : Posted in a previous version of this proposal

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : Posted in a previous version of this proposal

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.

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
Haw Loeung (hloeung) wrote :

LGTM

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

Change successfully merged at revision dd5ef38292c09d7d2530d0521bf25c31934e4152

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/unit/test_telegraf.py b/src/tests/unit/test_telegraf.py
2index d1ecd6b..88603c8 100644
3--- a/src/tests/unit/test_telegraf.py
4+++ b/src/tests/unit/test_telegraf.py
5@@ -1150,14 +1150,14 @@ def test_prometheus_client_output(mocker, monkeypatch, config):
6 telegraf.configure_prometheus_client_with_relation(interface)
7 expected = """
8 [[outputs.prometheus_client]]
9- listen = ":9126"
10+ listen = ":9103"
11 """
12 assert (
13 configs_dir().join("prometheus_client.conf").read().strip() == expected.strip()
14 )
15 network_get_primary_address.assert_called_once_with("prometheus-client")
16 interface.configure.assert_called_once_with(
17- "9126", hostname="foo", private_address="foo"
18+ "9103", hostname="foo", private_address="foo"
19 )
20
21

Subscribers

People subscribed via source and target branches

to all changes: