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.

Sign up for GitHub

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

Jump to bottom

Add default template to openmetrics & jmx config #6328

Merged
merged 4 commits into from
Apr 13, 2020
Merged

Add default template to openmetrics & jmx config #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b2672e
Add default to init
ChristineTChen Apr 13, 2020
fea2581
Sync openmetrics config
ChristineTChen Apr 13, 2020
4e95157
Move default template to jmx and openmetrics spec
ChristineTChen Apr 13, 2020
7dc21ef
Update jmx intg
ChristineTChen Apr 13, 2020
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: 0 additions & 2 deletions activemq/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ files:
- template: init_config
options:
- template: init_config/jmx
- template: init_config/default
- template: instances
options:
- template: instances/jmx
overrides:
host.value.example: localhost
port.value.example: 1616
- template: instances/default
- template: logs
example:
- type: file
Expand Down
2 changes: 0 additions & 2 deletions confluent_platform/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ files:
service_check_prefix.value.example: confluent
service_check_prefix.description: |
Service check prefix to use.
- template: init_config/default
- template: instances
overrides:
description: |
Expand All @@ -29,7 +28,6 @@ files:
The list of metrics collected by default are listed in `metrics.yaml`.
options:
- template: instances/jmx
- template: instances/default
- template: logs
example:
- type: file
Expand Down
1 change: 1 addition & 0 deletions datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/jmx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@
type: array
items:
type: object
- template: init_config/default
1 change: 1 addition & 0 deletions ...hecks_dev/datadog_checks/dev/tooling/templates/configuration/init_config/openmetrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- template: init_config/http
- template: init_config/default
2 changes: 2 additions & 0 deletions datadog_checks_dev/datadog_checks/dev/tooling/templates/configuration/instances/jmx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,5 @@
value:
example: false
type: boolean

- template: instances/default
2 changes: 0 additions & 2 deletions hive/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ files:
- template: init_config
options:
- template: init_config/jmx
- template: init_config/default
- template: instances
options:
- template: instances/jmx
overrides:
host.description: HiveServer2 or Hive Metastore JMX host to connect to.
port.value.example: 8809
port.description: HiveServer2 or Hive Metastore JMX port to connect to.
- template: instances/default
- template: logs
example:
- type: file
Expand Down
2 changes: 0 additions & 2 deletions jboss_wildfly/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ files:
service_check_prefix.required: true
service_check_prefix.value.example: jboss
service_check_prefix.description: Service check prefix to use.
- template: init_config/default
- template: instances
options:
- template: instances/jmx
Expand All @@ -21,7 +20,6 @@ files:
jmx_url.display_priority: 10
host.required: false
port.required: false
- template: instances/default
- template: logs
example:
- type: file
Expand Down
1 change: 0 additions & 1 deletion openmetrics/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ files:
options:
- template: init_config
options:
- template: init_config/default
- template: init_config/openmetrics
- template: instances
options:
Expand Down
14 changes: 7 additions & 7 deletions openmetrics/datadog_checks/openmetrics/data/conf.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
#
init_config:

## @param service - string - optional
## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
##
## Additionally, this sets the default `service` for every log source.
#
# service: <SERVICE>

## @param proxy - mapping - optional
## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
## to specify hosts that must bypass proxies.
Expand Down Expand Up @@ -41,6 +34,13 @@ init_config:
#
# timeout: 10

## @param service - string - optional
## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
##
## Additionally, this sets the default `service` for every log source.
#
# service: <SERVICE>

## Every instance is scheduled independent of the others.
#
instances:
Expand Down