Add Icinga2 input plugin #2668 #4559

mlabouardy · 2018-08-15T08:59:23Z

Resolves #2658

Required for all PRs:

Signed CLA.
Associated README.md updated.
Has appropriate unit tests.

glinton

Thanks for this!

glinton · 2018-08-15T16:29:43Z

plugins/inputs/icinga2/icinga2.go

+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+  `


Missing insecure_skip_verify example line.

glinton · 2018-08-15T16:30:04Z

plugins/inputs/icinga2/README.md

+  # tls_cert = "/etc/telegraf/cert.pem"
+  # tls_key = "/etc/telegraf/key.pem"
+  ## Use TLS but skip chain & host verification
+```


Add # insecure_skip_verify = false

glinton · 2018-08-15T16:37:37Z

plugins/inputs/icinga2/icinga2.go

+  # server = "https://localhost:5665"
+
+  ## Required Icinga2 object type ("services" or "hosts, default "services")
+  # filter = "services"


Maybe make this a bool, something like defaulting to hosts=false, meaning it will collect services only; unless there are other object types besides services and hosts

I actually prefer this style, if we have hosts=false then it isn't clear that it means services. Also if another object type has support added then a bool won't scale up to additional items. I also wonder if a user would ever want to collect both services and hosts? Maybe this should be an array: ["services", "hosts"]? Finally, filter is a somewhat confusing because normally you filter things out, maybe it should be renamed object_type?

Oh ya, good call

I agree, i renamed to object_type

glinton · 2018-08-15T16:39:09Z

plugins/inputs/icinga2/icinga2.go

+		return err
+	}
+
+	req.SetBasicAuth(i.Username, i.Password)


Maybe only set this if Username/Password are not empty

mlabouardy · 2018-08-15T19:23:04Z

@glinton done

mlabouardy · 2018-08-16T07:56:49Z

when this will be merged

dupondje · 2018-08-16T09:04:17Z

plugins/inputs/icinga2/README.md

+
+### Measurements & Fields:
+
+- ll measurements have the following fields:


Small typo :)

done, thanks :)

danielnelson

I think there are just a few tweaks needed:

danielnelson · 2018-08-16T21:59:30Z

README.md

@@ -165,6 +165,8 @@ configuration options.
 * [haproxy](./plugins/inputs/haproxy)
 * [hddtemp](./plugins/inputs/hddtemp)
 * [httpjson](./plugins/inputs/httpjson) (generic JSON-emitting http service plugin)
+* [icinga2](./plugins/inputs/icinga2)
+* [internal](./plugins/inputs/internal)


Can you fix the sorting of the plugin, internal is already listed so you can remove that line.

danielnelson · 2018-08-16T22:08:30Z

plugins/inputs/icinga2/README.md

+- All measurements have the following tags:
+    - check_command
+    - display_name
+    - source


Although not documented yet, as discussed in #4413 we are planning to standardize on source as the hostname of the metric source and split out other components. Can you change the style of these tags to be:

source=example.org,port=5665,scheme=https

danielnelson · 2018-08-16T22:22:11Z

plugins/inputs/icinga2/README.md

+
+- All measurements have the following fields:
+    - name (string)
+    - state (int)


We recently established a pattern for encoding enum like values in several plugins, the basic idea is to use a tag with a string description, and a field with the code:

icinga2,state=warning state_code=1

It looks like we would need a mapping function for each object type?

danielnelson · 2018-08-16T22:23:19Z

plugins/inputs/icinga2/icinga2_test.go

+	"github.com/influxdata/telegraf/testutil"
+)
+
+func TestGatherStatus(t *testing.T) {


Add a unit test for object_type = "hosts" as well.

danielnelson · 2018-08-16T22:25:01Z

plugins/inputs/icinga2/README.md

@@ -0,0 +1,62 @@
+# Example Input Plugin


Icinga2 Input Plugin

danielnelson · 2018-08-16T22:27:24Z

plugins/inputs/icinga2/icinga2.go

+		tags["check_command"] = check.Attrs.CheckCommand
+		tags["source"] = i.Server
+
+		acc.AddFields(fmt.Sprintf("icinga2_%s_status", i.ObjectType), fields, tags)


Optional: consider dropping the _status suffix here, it feels superfluous.

mlabouardy · 2018-08-23T00:48:33Z

@danielnelson @glinton I have implemented all the required changes :)

mlabouardy and others added 12 commits April 12, 2017 16:22

init icinga2 input plugin

5311efa

implement telegraf interface functions

c139f41

add icinga2 to readme

f04cd31

filter icinga2 objects to query

fd19010

icinga2 plugin unit test

0c0bd2f

update readme

b064c99

fix test

6cee6cc

add missing comma

912ff96

Merge branch 'master' of https://github.com/influxdata/telegraf

159daa6

fix required changes

459026c

fix field name

6ddffc4

Merge branch 'master' into master

ab8f443

mlabouardy mentioned this pull request Aug 15, 2018

Add Icinga2 input plugin #2668

Closed

3 tasks

mlabouardy added 7 commits August 15, 2018 11:03

added line before composite

d927c8f

Merge branch 'master' of github.com:mlabouardy/telegraf

5209a50

fmt code

78e30da

change reference name

9393c06

fix reference

efe91c3

added source field

b3f4dd9

made unit test pass

5381259

glinton suggested changes Aug 15, 2018

View reviewed changes

add skip tls verification option

c559740

glinton approved these changes Aug 15, 2018

View reviewed changes

dupondje reviewed Aug 16, 2018

View reviewed changes

fix typo

59cc0c6

danielnelson suggested changes Aug 16, 2018

View reviewed changes

mlabouardy added 2 commits August 23, 2018 01:02

export source, port and scheme tags

00956d0

use state enum

4de11a9

mlabouardy added 3 commits August 23, 2018 01:23

unit test for host objects

7ff3ee6

fix state code

ed570e5

fix host json mock

709980e

danielnelson approved these changes Aug 23, 2018

View reviewed changes

danielnelson added this to the 1.8.0 milestone Aug 23, 2018

danielnelson added the new plugin label Aug 23, 2018

danielnelson merged commit e72fab7 into influxdata:master Aug 23, 2018

rgitzel pushed a commit to rgitzel/telegraf that referenced this pull request Oct 17, 2018

Add Icinga2 input plugin (influxdata#4559)

9665216

otherpirate pushed a commit to otherpirate/telegraf that referenced this pull request Mar 15, 2019

Add Icinga2 input plugin (influxdata#4559)

c444927

otherpirate pushed a commit to otherpirate/telegraf that referenced this pull request Mar 15, 2019

Add Icinga2 input plugin (influxdata#4559)

2572f2b

dupondje pushed a commit to dupondje/telegraf that referenced this pull request Apr 22, 2019

Add Icinga2 input plugin (influxdata#4559)

6fb2a9e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Icinga2 input plugin #2668 #4559

Add Icinga2 input plugin #2668 #4559

mlabouardy commented Aug 15, 2018 •

edited by glinton

Loading

glinton left a comment

glinton Aug 15, 2018

mlabouardy Aug 15, 2018

glinton Aug 15, 2018

glinton Aug 15, 2018

danielnelson Aug 15, 2018

glinton Aug 15, 2018

mlabouardy Aug 15, 2018

glinton Aug 15, 2018

mlabouardy Aug 15, 2018

mlabouardy commented Aug 15, 2018

mlabouardy commented Aug 16, 2018

dupondje Aug 16, 2018

mlabouardy Aug 16, 2018

danielnelson left a comment

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

danielnelson Aug 16, 2018

mlabouardy Aug 23, 2018

mlabouardy commented Aug 23, 2018


		### Measurements & Fields:

		- ll measurements have the following fields:

Add Icinga2 input plugin #2668 #4559

Add Icinga2 input plugin #2668 #4559

Conversation

mlabouardy commented Aug 15, 2018 • edited by glinton Loading

Required for all PRs:

glinton left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mlabouardy commented Aug 15, 2018

mlabouardy commented Aug 16, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danielnelson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mlabouardy commented Aug 23, 2018

mlabouardy commented Aug 15, 2018 •

edited by glinton

Loading