Telegraf Charm

Merge ~vikaskrishnan/charm-telegraf:bugfix-2036866 into charm-telegraf:master

  1. Git
  2. lp:~vikaskrishnan/charm-telegraf
  3. bugfix-2036866
  4. Merge into master
Proposed by Vikas Krishnan Radhakrishnan
Status: Merged
Approved by: Tianqi Xiao
Approved revision: def5aa67b4bab9ac3a0107963df74aacc9fc1e07
Merged at revision: 5a778a2aaa56398968e76879b4959926ce23e7d4
Proposed branch: ~vikaskrishnan/charm-telegraf:bugfix-2036866
Merge into: charm-telegraf:master
Diff against target: 65 lines (+7/-7)
1 file modified
src/templates/postgresql.tmpl (+7/-7)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Eric Chen Approve
Review via email: mp+454080@code.launchpad.net

Commit message

Fix deprecated option 'version' in postgresql template.

Description of the change

The option 'version' is now renamed to 'min_version' following the upstream change https://github.com/influxdata/telegraf/pull/13620/commits/a6c144aa5770e53cb7313b8b17f6620fe656b363

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
Eric Chen (eric-chen) wrote (last edit ):

LGTM, so trigger CI manually

review: Approve
Revision history for this message
Eric Chen (eric-chen) :
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:def5aa67b4bab9ac3a0107963df74aacc9fc1e07
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/30/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/380/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/741/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:def5aa67b4bab9ac3a0107963df74aacc9fc1e07
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest31/381/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/742/

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

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

LGTM

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

Change successfully merged at revision 5a778a2aaa56398968e76879b4959926ce23e7d4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/templates/postgresql.tmpl b/src/templates/postgresql.tmpl
2index 2eee7f8..931bd78 100644
3--- a/src/templates/postgresql.tmpl
4+++ b/src/templates/postgresql.tmpl
5@@ -26,13 +26,13 @@
6
7 [[inputs.postgresql_extensible.query]]
8 sqlquery="SELECT * FROM pg_stat_database"
9- version=901
10+ min_version=901
11 withdbname=false
12 tagvalue=""
13
14 [[inputs.postgresql_extensible.query]]
15 sqlquery="SELECT * FROM pg_stat_bgwriter"
16- version=901
17+ min_version=901
18 withdbname=false
19 tagvalue=""
20
21@@ -50,7 +50,7 @@
22 FROM pg_stat_activity
23 GROUP BY datname"""
24 {% else %}
25- version=901
26+ min_version=901
27 sqlquery="""
28 SELECT
29 datname,
30@@ -78,7 +78,7 @@
31 WHERE state IS NOT NULL
32 GROUP BY datname, state, wait_event_type"""
33 {% else %}
34- version=902
35+ min_version=902
36 sqlquery="""
37 SELECT
38 datname,
39@@ -104,7 +104,7 @@
40 ELSE GREATEST(EXTRACT(EPOCH FROM clock_timestamp() - pg_last_xact_replay_timestamp()), 0)
41 END AS lag_time"""
42 {% else %}
43- version=901
44+ min_version=901
45 sqlquery="""
46 SELECT
47 CASE
48@@ -125,7 +125,7 @@
49 pg_wal_lsn_diff(pg_current_wal_insert_lsn(), replay_lsn)::integer AS lag_bytes
50 FROM pg_stat_replication"""
51 {% else %}
52- version=902
53+ min_version=902
54 sqlquery="""
55 SELECT
56 COALESCE(client_hostname, host(client_addr)) AS standby,
57@@ -136,7 +136,7 @@
58 [[inputs.postgresql_extensible.query]]
59 withdbname=false
60 tagvalue=""
61- version=904
62+ min_version=904
63 sqlquery="""
64 SELECT
65 archived_count AS archive_archived_count,

Subscribers

People subscribed via source and target branches