~sajoupa/charm-telegraf:black.os-path-string.relation-port-9103

Branch merges

Propose for merging

Merged into charm-telegraf:master at revision ae9c8df0da1661355eab1bcb8485c5134525adf3

Haw Loeung: Approve (+1) on 2021-02-18

Barry Price: Approve on 2021-02-18

BootStack Reviewers: Pending requested 2021-02-18

Diff: 50 lines (+10/-8)

2 files modified

src/reactive/telegraf.py (+9/-7)
src/tests/unit/test_telegraf.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

7cc5fc1... by Laurent Sesquès on 2021-02-18

black fixes, use base_dir().join() instead of os.path.join() to get an str in a test function, make the default port in a prometheus relation 9103

1533cfb... by Barry Price on 2021-02-18

small fixes: remove unneeded host.service_reload, add a debug log for configure_telegraf(), and remove un unneeded 'else:'

Reviewed-on: https://code.launchpad.net/~barryprice/charm-telegraf/+git/charm-telegraf/+merge/398222
Reviewed-by: Haw Loeung <email address hidden>

562a3cc... by Barry Price on 2021-02-18

Add support for ip_range in the prometheus-client output plugin

Reviewed-on: https://code.launchpad.net/~barryprice/charm-telegraf/+git/charm-telegraf/+merge/398221
Reviewed-by: Haw Loeung <email address hidden>

dd5ef38... by Barry Price on 2021-02-18

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

Reviewed-on: https://code.launchpad.net/~barryprice/charm-telegraf/+git/charm-telegraf/+merge/398220
Reviewed-by: Haw Loeung <email address hidden>

b37e1a3... by Barry Price on 2021-02-18

Merge branch 'add_ip_range_support' into misc-fixes

bb61dba... by Barry Price on 2021-02-18

Merge branch 'prometheus-client-default-port-9103' into add_ip_range_support

4301b93... by Barry Price on 2021-02-18

Fix conflicts

681fc18... by Barry Price on 2021-02-18

Split prometheus_client output config out of the main config file. Allow a prometheus-client relation to prometheus even if prometheus_output_port is set (and use that port in the relation).

Reviewed-on: https://code.launchpad.net/~barryprice/charm-telegraf/+git/charm-telegraf/+merge/398218
Reviewed-by: Haw Loeung <email address hidden>

6296374... by Barry Price on 2021-02-18

Address review comments

6ef444a... by Laurent Sesquès on 2021-02-10

when using the snap, set config files ownership to snap_daemon https://snapcraft.io/docs/services-and-daemons

Reviewed-on: https://code.launchpad.net/~sajoupa/charm-telegraf/+git/telegraf-charm/+merge/397492
Reviewed-by: Benjamin Allot <email address hidden>