Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBM MQ Metricbeat module #8870

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b4623af
Initial commit for the IBM MQ Metricbeat module -- No Logic included
felix-lessoer Nov 1, 2018
ff6683e
Enabled the module to do the job like the original beat
felix-lessoer Nov 6, 2018
2294c38
run mage update
ruflin May 10, 2019
42cb8dc
Lib updated
felix-lessoer May 21, 2019
a2795d6
Make it working again
felix-lessoer May 21, 2019
1550ff3
Removed ibmmqlib and split metricsets. Keep only qmgr in this branch
felix-lessoer Sep 19, 2019
071e098
Removed hound issues
felix-lessoer Sep 19, 2019
c747c0d
Changed comment format
felix-lessoer Sep 19, 2019
246f1b2
Changed comments
felix-lessoer Sep 19, 2019
8fabc3d
Remove unused metricsets from config
ChrsMark Sep 19, 2019
683aa30
fmt files
ChrsMark Sep 20, 2019
1bab9bd
Rename lib to util to follow project's pattern
ChrsMark Sep 23, 2019
387d134
Make ibm module optional
ChrsMark Sep 24, 2019
fc4e7cc
working version with docker
ChrsMark Sep 25, 2019
6f028c2
Add field docs
ChrsMark Sep 25, 2019
a1667e2
Add more fields description
ChrsMark Sep 26, 2019
01612f1
Add mqlib files and set mq envs in magefile
ChrsMark Sep 26, 2019
b188eb4
Remove unused lib files
ChrsMark Sep 26, 2019
1d0193f
fix hound issues
ChrsMark Sep 26, 2019
f341f82
Make use of the dynamic ibm wrapper
ChrsMark Sep 27, 2019
5e6488b
Add docs
ChrsMark Sep 27, 2019
09b8cd1
fix hound
ChrsMark Sep 27, 2019
69ab721
Imporve error handling of dynamic loading
ChrsMark Sep 27, 2019
3d3a544
Improve docs
ChrsMark Sep 27, 2019
8027eb1
tune docs
ChrsMark Sep 30, 2019
1214695
Add data.json
ChrsMark Sep 30, 2019
3eac7af
Remove ibm c files
ChrsMark Sep 30, 2019
5511cae
Improve docs
ChrsMark Sep 30, 2019
f36ecb1
Add Dockerfile
ChrsMark Sep 30, 2019
c05dbd1
Add test file
ChrsMark Sep 30, 2019
15cbb6d
update fmt
ChrsMark Sep 30, 2019
6e37c8e
Add release: beta in fields
ChrsMark Sep 30, 2019
1a2b97f
update docs
ChrsMark Sep 30, 2019
44a688e
fix docs
ChrsMark Oct 1, 2019
304d4a3
Switch back to static linking with options
ChrsMark Oct 1, 2019
a6dc4d6
Update metricbeat Dockerfile to download ibm redist client
ChrsMark Oct 1, 2019
9f300fe
tune module list creation script to by-pass metricbeat module
ChrsMark Oct 1, 2019
d9d5ec8
Fix include issue
ChrsMark Oct 1, 2019
1cc86d2
Tune magefile.go to download IBM client before build
ChrsMark Oct 1, 2019
d0586d8
Tune magefile more
ChrsMark Oct 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions x-pack/metricbeat/include/list.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions x-pack/metricbeat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (
"os"

"github.com/elastic/beats/x-pack/metricbeat/cmd"
_ "github.com/felix-lessoer/beats/x-pack/metricbeat/module/ibmmq"
ChrsMark marked this conversation as resolved.
Show resolved Hide resolved
_ "github.com/felix-lessoer/beats/x-pack/metricbeat/module/ibmmq/qmgr"
)

func main() {
Expand Down
28 changes: 28 additions & 0 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,34 @@ metricbeat.modules:
# fields: # added to the the response in root. overwrites existing fields
# key: "value"

#-------------------------------- Ibmmq Module --------------------------------
- module: ibmmq
metricsets: ["qmgr"]
period: 10s
hosts: ["localhost"]
enabled: true

#client_id: metricbeat
#retries: 3
#backoff: 250ms

# List of Topics to query metadata for. If empty, all topics will be queried.
#topics: []

# Optional SSL. By default is off.
# List of root certificates for HTTPS server verifications
#ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]

# Certificate for SSL client authentication
#ssl.certificate: "/etc/pki/client/cert.pem"

# Client Certificate Key
#ssl.key: "/etc/pki/client/cert.key"

# SASL authentication
#username: ""
#password: ""

#------------------------------- Jolokia Module -------------------------------
- module: jolokia
#metricsets: ["jmx"]
Expand Down
26 changes: 26 additions & 0 deletions x-pack/metricbeat/module/ibmmq/_meta/config.reference.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- module: ibmmq
metricsets: ["qmgr"]
ChrsMark marked this conversation as resolved.
Show resolved Hide resolved
period: 10s
hosts: ["localhost"]
enabled: true

#client_id: metricbeat
#retries: 3
#backoff: 250ms

# List of Topics to query metadata for. If empty, all topics will be queried.
#topics: []

# Optional SSL. By default is off.
# List of root certificates for HTTPS server verifications
#ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]

# Certificate for SSL client authentication
#ssl.certificate: "/etc/pki/client/cert.pem"

# Client Certificate Key
#ssl.key: "/etc/pki/client/cert.key"

# SASL authentication
#username: ""
#password: ""
11 changes: 11 additions & 0 deletions x-pack/metricbeat/module/ibmmq/_meta/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Module: ibmmq
# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-ibmmq.html

- module: ibmmq
#metricsets:
# - qmgr
period: 10s

hosts: ["localhost"]
#username: guest
#password: guest
9 changes: 9 additions & 0 deletions x-pack/metricbeat/module/ibmmq/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
This is the IBM MQ metricbeat module. This module uses PCF messages to collect metrics and status information from different IBM MQ objects.
With IBM MQ > v9 its also possible to collect data using the subscribe mode.

At the moment this is collecting data from Queue Manager.

[float]
=== Compability

This module is tested with IBM MQ v9.1.0 but older version will work as well. The subscribe mode only works with IBM MQ > v9.
11 changes: 11 additions & 0 deletions x-pack/metricbeat/module/ibmmq/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- key: ibmmq
title: "ibmmq"
description: >
experimental[]

ibmmq module
fields:
- name: ibmmq
type: group
description: >
fields:
23 changes: 23 additions & 0 deletions x-pack/metricbeat/module/ibmmq/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions x-pack/metricbeat/module/ibmmq/ibmmq.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

package ibmmq

import "github.com/elastic/beats/libbeat/logp"

var debugf = logp.MakeDebug("ibmmq")
Loading