Add ActiveMQ input plugin #2689

mlabouardy · 2017-04-19T14:17:41Z

Resolves #2622

Required for all PRs:

CHANGELOG.md updated (we recommend not updating this until the PR has been approved by a maintainer)
Sign CLA (if not already signed)
README.md updated (if adding a new plugin)

danielnelson · 2017-06-27T00:31:19Z

plugins/inputs/activemq/README.md

+$ ./telegraf -config telegraf.conf -input-filter activemq -test
+queues_metrics,name=sandra,host=88284b2fe51b consumer_count=0i,enqueue_count=0i,dequeue_count=0i,size=0i 1492610703000000000
+queues_metrics,name=Test,host=88284b2fe51b dequeue_count=0i,size=0i,consumer_count=0i,enqueue_count=0i 1492610703000000000
+topics_metrics,name=ActiveMQ.Advisory.MasterBroker\ ,host=88284b2fe51b size=0i,consumer_count=0i,enqueue_count=1i,dequeue_count=0i 1492610703000000000


Seems like there might be a bug where the name has trailing whitespace characters.

Don't forget to regenerate this section

danielnelson · 2017-06-27T00:32:43Z

plugins/inputs/activemq/activemq.go

+	## Required password used for HTTP Basic Authentication
+	# password = "admin"
+	## Required ActiveMQ webadmin root path
+	# webadmin = "admin"


Do a two space indent here

danielnelson · 2017-06-27T00:35:21Z

plugins/inputs/activemq/activemq.go

+	a.GatherSubscribersMetrics(acc, subscribers)
+
+	return nil
+}


Can you reduce the amount of vertical whitespace in this function?

danielnelson · 2017-06-27T00:35:33Z

plugins/inputs/activemq/activemq.go

+	defer resp.Body.Close()
+
+	return ioutil.ReadAll(resp.Body)
+}


Can you reduce the amount of vertical whitespace in this function?

remove trailing spaces for queue name in gather metrics remove indent

fix for review influxdata#2689

danielnelson · 2018-08-03T00:54:02Z

@mlabouardy I think the tests will pass if we rebase the branch, could you do that for me and then I'll take a final look.

remove trailing spaces for queue name in gather metrics remove indent

mlabouardy · 2018-08-04T21:04:35Z

@danielnelson done

danielnelson

Here are a few minor things we should address before merging:

danielnelson · 2018-08-06T19:09:48Z

plugins/inputs/activemq/activemq.go

+}
+
+func (a *ActiveMQ) GetMetrics(keyword string) ([]byte, error) {
+	client := &http.Client{}


To avoid any issues sharing the underlying http.Transport we don't use the DefaultTransport. We can use the same pattern as the apache plugin:

Add a field to the ActiveMQ struct to hold the client, and initialize it the first call to Gather:

telegraf/plugins/inputs/apache/apache.go

Lines 69 to 75 in 0759c8b

if n.client == nil {

client, err := n.createHttpClient()

if err != nil {

return err

}

n.client = client

}

Initialization:

telegraf/plugins/inputs/apache/apache.go

Lines 95 to 109 in 0759c8b

func (n *Apache) createHttpClient() (*http.Client, error) {

tlsCfg, err := n.ClientConfig.TLSConfig()

if err != nil {

return nil, err

}

client := &http.Client{

Transport: &http.Transport{

TLSClientConfig: tlsCfg,

},

Timeout: n.ResponseTimeout.Duration,

}

return client, nil

}

danielnelson · 2018-08-06T19:10:53Z

plugins/inputs/activemq/activemq.go

+		records["enqueue_count"] = queue.Stats.EnqueueCount
+		records["dequeue_count"] = queue.Stats.DequeueCount
+
+		acc.AddFields("queues_metrics", records, tags)


To avoid confusion with other plugins we should call this activemq_queues.

danielnelson · 2018-08-06T19:11:08Z

plugins/inputs/activemq/activemq.go

+		records["enqueue_count"] = topic.Stats.EnqueueCount
+		records["dequeue_count"] = topic.Stats.DequeueCount
+
+		acc.AddFields("topics_metrics", records, tags)


Rename activemq_topics

danielnelson · 2018-08-06T19:11:23Z

plugins/inputs/activemq/activemq.go

+		records["enqueue_counter"] = subscriber.Stats.EnqueueCounter
+		records["dequeue_counter"] = subscriber.Stats.DequeueCounter
+
+		acc.AddFields("subscribers_metrics", records, tags)


Rename activemq_subscribers

danielnelson · 2018-08-06T19:17:02Z

plugins/inputs/activemq/README.md

+    - enqueue_counter
+    - dequeue_counter
+
+### Tags:


We will also need a tag for the server for differentiation when running the plugin multiple times. Following the discussion on #4413, let's add source and port tags to all three measurements:

source=192.168.50.10,port=8161

danielnelson · 2018-08-06T19:19:51Z

plugins/inputs/activemq/README.md

+$ ./telegraf -config telegraf.conf -input-filter activemq -test
+queues_metrics,name=sandra,host=88284b2fe51b consumer_count=0i,enqueue_count=0i,dequeue_count=0i,size=0i 1492610703000000000
+queues_metrics,name=Test,host=88284b2fe51b dequeue_count=0i,size=0i,consumer_count=0i,enqueue_count=0i 1492610703000000000
+topics_metrics,name=ActiveMQ.Advisory.MasterBroker\ ,host=88284b2fe51b size=0i,consumer_count=0i,enqueue_count=1i,dequeue_count=0i 1492610703000000000


Don't forget to regenerate this section

mlabouardy · 2018-08-09T14:55:14Z

@danielnelson done

mlabouardy · 2018-08-09T15:21:40Z

@danielnelson I cannot make the test pass, any idea what I did wrong ?

danielnelson

I think these are the cause of test failures:

danielnelson · 2018-08-09T19:01:56Z

plugins/inputs/activemq/activemq.go

+
+		tags["name"] = topic.Name
+		tags["source"] = a.Server
+		tags["port"] = string(a.Port)


This won't work, instead use strconv.FormatInt.

danielnelson · 2018-08-09T19:02:56Z

plugins/inputs/activemq/activemq_test.go

+
+	var acc testutil.Accumulator
+
+	activeMQ := new(ActiveMQ)


You will need to initialize the struct in the same way as in the init function:

activeMQ := &ActiveMQ{ Server: "localhost", Port: 8161, }

mlabouardy · 2018-08-09T19:19:55Z

@danielnelson resolved

glinton · 2018-08-09T22:43:28Z

plugins/inputs/activemq/activemq.go

+var sampleConfig = `
+  ## Required ActiveMQ Endpoint
+  # server = "192.168.50.10"
+  ## Required ActiveMQ port


Nitpick/suggestion: add newlines between config options

mlabouardy · 2018-08-13T18:53:57Z

@danielnelson when this can be merged ? :)

nhaugo requested a review from danielnelson April 19, 2017 17:09

nhaugo assigned danielnelson Apr 19, 2017

danielnelson added this to the 1.4.0 milestone Apr 19, 2017

gdepuille mentioned this pull request Jun 22, 2017

Plugin suggestion: ActiveMQ #2622

Closed

danielnelson suggested changes Jun 27, 2017

View reviewed changes

danielnelson modified the milestones: 1.4.0, 1.5.0 Aug 14, 2017

danielnelson added the feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin label Aug 24, 2017

danielnelson removed this from the 1.5.0 milestone Sep 13, 2017

russorat added the new plugin label Jan 20, 2018

vasechko-sergey pushed a commit to vasechko-sergey/telegraf that referenced this pull request Mar 30, 2018

fix for review influxdata#2689

df1b10b

remove trailing spaces for queue name in gather metrics remove indent

mlabouardy added a commit to mlabouardy/telegraf that referenced this pull request Mar 30, 2018

Merge pull request #1 from vasechko-sergey/activemq

53e82f2

fix for review influxdata#2689

mlabouardy and others added 3 commits August 4, 2018 23:03

activemq input plugin

a57479b

activemq test & README

2b5c2e3

fix for review influxdata#2689

454d7ad

remove trailing spaces for queue name in gather metrics remove indent

mlabouardy force-pushed the activemq branch from 53e82f2 to 454d7ad Compare August 4, 2018 21:04

danielnelson suggested changes Aug 6, 2018

View reviewed changes

add client field to activemq struct

189c429

fix package name

6a0acbb

danielnelson reviewed Aug 9, 2018

View reviewed changes

fix unit test

c04543e

glinton approved these changes Aug 9, 2018

View reviewed changes

add line between config options

f410178

danielnelson approved these changes Aug 13, 2018

View reviewed changes

glinton added this to the 1.8.0 milestone Aug 13, 2018

glinton merged commit b9ff1d0 into influxdata:master Aug 13, 2018

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

Add ActiveMQ input plugin (influxdata#2689)

47d805b

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

Add ActiveMQ input plugin (influxdata#2689)

59b7f91

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

Add ActiveMQ input plugin (influxdata#2689)

182ea09

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

Add ActiveMQ input plugin (influxdata#2689)

d6d3625

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ActiveMQ input plugin #2689

Add ActiveMQ input plugin #2689

mlabouardy commented Apr 19, 2017 •

edited by glinton

Loading

danielnelson Jun 27, 2017

danielnelson Aug 6, 2018

danielnelson Jun 27, 2017

danielnelson Jun 27, 2017

danielnelson Jun 27, 2017

danielnelson commented Aug 3, 2018

mlabouardy commented Aug 4, 2018

danielnelson left a comment

danielnelson Aug 6, 2018

danielnelson Aug 6, 2018

danielnelson Aug 6, 2018

danielnelson Aug 6, 2018

danielnelson Aug 6, 2018

danielnelson Aug 6, 2018

mlabouardy commented Aug 9, 2018

mlabouardy commented Aug 9, 2018

danielnelson left a comment

danielnelson Aug 9, 2018

danielnelson Aug 9, 2018

mlabouardy Aug 9, 2018

mlabouardy commented Aug 9, 2018

glinton Aug 9, 2018

mlabouardy Aug 10, 2018

mlabouardy commented Aug 13, 2018

	if n.client == nil {
	client, err := n.createHttpClient()
	if err != nil {
	return err
	}
	n.client = client
	}

	func (n Apache) createHttpClient() (http.Client, error) {
	tlsCfg, err := n.ClientConfig.TLSConfig()
	if err != nil {
	return nil, err
	}

	client := &http.Client{
	Transport: &http.Transport{
	TLSClientConfig: tlsCfg,
	},
	Timeout: n.ResponseTimeout.Duration,
	}

	return client, nil
	}

Add ActiveMQ input plugin #2689

Add ActiveMQ input plugin #2689

Conversation

mlabouardy commented Apr 19, 2017 • edited by glinton Loading

Required for all PRs:

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

danielnelson commented Aug 3, 2018

mlabouardy commented Aug 4, 2018

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

mlabouardy commented Aug 9, 2018

mlabouardy commented Aug 9, 2018

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

mlabouardy commented Aug 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mlabouardy commented Aug 13, 2018

mlabouardy commented Apr 19, 2017 •

edited by glinton

Loading