Add excludeJobMetrics parameter available on collectd-jenkins v2.4.0 (#…

…1712)

docs/monitors/collectd-jenkins.md

@@ -88,6 +88,7 @@ Configuration](../monitor-config.md#common-configuration).**
 | `path` | no | `string` |  |
 | `metricsKey` | **yes** | `string` | Key required for collecting metrics.  The access key located at `Manage Jenkins > Configure System > Metrics > ADD.` If empty, click `Generate`. |
 | `enhancedMetrics` | no | `bool` | Whether to enable enhanced metrics (**default:** `false`) |
+| `excludeJobMetrics` | no | `bool` | Set to *true* to to exclude job metrics retrieved from `/api/json` endpoint (**default:** `false`) |
 | `includeMetrics` | no | `list of strings` | Used to enable individual enhanced metrics when `enhancedMetrics` is false |
 | `username` | no | `string` | User with security access to jenkins |
 | `apiToken` | no | `string` | API Token of the user |

pkg/monitors/collectd/jenkins/jenkins.go

@@ -36,6 +36,8 @@ type Config struct {
 	MetricsKey string `yaml:"metricsKey" validate:"required"`
 	// Whether to enable enhanced metrics
 	EnhancedMetrics *bool `yaml:"enhancedMetrics"`
+	// Set to *true* to to exclude job metrics retrieved from `/api/json` endpoint
+	ExcludeJobMetrics *bool `yaml:"excludeJobMetrics"`
 	// Used to enable individual enhanced metrics when `enhancedMetrics` is
 	// false
 	IncludeMetrics []string `yaml:"includeMetrics"`
@@ -82,6 +84,7 @@ func (m *Monitor) Configure(conf *Config) error {
 			"Interval":            conf.IntervalSeconds,
 			"MetricsKey":          conf.MetricsKey,
 			"EnhancedMetrics":     conf.EnhancedMetrics,
+			"ExcludeJobMetrics":   conf.ExcludeJobMetrics,
 			"Username":            conf.Username,
 			"APIToken":            conf.APIToken,
 			"ssl_keyfile":         conf.SSLKeyFile,

selfdescribe.json

@@ -12637,6 +12637,14 @@
             "type": "bool",
             "elementKind": ""
           },
+          {
+            "yamlName": "excludeJobMetrics",
+            "doc": "Set to *true* to to exclude job metrics retrieved from `/api/json` endpoint",
+            "default": "false",
+            "required": false,
+            "type": "bool",
+            "elementKind": ""
+          },
           {
             "yamlName": "includeMetrics",
             "doc": "Used to enable individual enhanced metrics when `enhancedMetrics` is false",