Skip to content

Commit

Permalink
Fix codecov project names and openmetrics config specs (DataDog#794)
Browse files Browse the repository at this point in the history
* Fix codecov project names

* Fix openmetrics config template

* Fix autoconf
  • Loading branch information
ChristineTChen authored Jan 25, 2021
1 parent e0f0566 commit d34ba3f
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 24 deletions.
16 changes: 8 additions & 8 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ coverage:
default:
target: 75
if_ci_failed: error
AWS Pricing:
AWS_Pricing:
target: 75
flags:
- aws_pricing
Aqua:
target: 75
flags:
- aqua
BIND 9:
BIND_9:
target: 75
flags:
- bind9
Expand All @@ -44,7 +44,7 @@ coverage:
target: 75
flags:
- gnatsd
Gnatsd Streaming:
Gnatsd_Streaming:
target: 75
flags:
- gnatsd_streaming
Expand Down Expand Up @@ -72,11 +72,11 @@ coverage:
target: 75
flags:
- nextcloud
PHP APCu:
PHP_APCu:
target: 75
flags:
- php_apcu
PHP OPcache:
PHP_OPcache:
target: 75
flags:
- php_opcache
Expand All @@ -92,15 +92,15 @@ coverage:
target: 75
flags:
- puma
Reboot Required:
Reboot_Required:
target: 75
flags:
- reboot_required
Redis Sentinel:
Redis_Sentinel:
target: 75
flags:
- redis_sentinel
Riak MDC Replication:
Riak_MDC_Replication:
target: 75
flags:
- riak_repl
Expand Down
4 changes: 2 additions & 2 deletions cyral/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ files:
options:
- template: init_config
options:
- template: init_config/default
- template: init_config/openmetrics_legacy
- template: instances
options:
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.example: http://localhost:9018/metrics
34 changes: 33 additions & 1 deletion cyral/datadog_checks/cyral/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,38 @@
#
init_config:

## @param proxy - mapping - optional
## Set HTTP or HTTPS proxies for all instances. Use the `no_proxy` list
## to specify hosts that must bypass proxies.
##
## The SOCKS protocol is also supported like so:
##
## socks5://user:pass@host:port
##
## Using the scheme `socks5` causes the DNS resolution to happen on the
## client, rather than on the proxy server. This is in line with `curl`,
## which uses the scheme to decide whether to do the DNS resolution on
## the client or proxy. If you want to resolve the domains on the proxy
## server, use `socks5h` as the scheme.
#
# proxy:
# http: http://<PROXY_SERVER_FOR_HTTP>:<PORT>
# https: https://<PROXY_SERVER_FOR_HTTPS>:<PORT>
# no_proxy:
# - <HOSTNAME_1>
# - <HOSTNAME_2>

## @param skip_proxy - boolean - optional - default: false
## If set to `true`, this makes the check bypass any proxy
## settings enabled and attempt to reach services directly.
#
# skip_proxy: false

## @param timeout - number - optional - default: 10
## The timeout for connecting to services.
#
# timeout: 10

## @param service - string - optional
## Attach the tag `service:<SERVICE>` to every metric, event, and service check emitted by this integration.
##
Expand All @@ -19,7 +51,7 @@ instances:
- prometheus_url: <PROMETHEUS_URL>

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down
6 changes: 3 additions & 3 deletions gatekeeper/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ files:
options:
- template: init_config
options:
- template: init_config/openmetrics
- template: init_config/openmetrics_legacy
- template: instances
options:
- name: gatekeeper_health_endpoint
Expand All @@ -13,7 +13,7 @@ files:
value:
type: string
example: http://%%host%%:9090
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.value.example: http://%%host%%:8888/metrics

Expand All @@ -33,6 +33,6 @@ files:
value:
type: string
example: http://%%host%%:9090
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.value.example: http://%%host%%:8888/metrics
2 changes: 1 addition & 1 deletion gatekeeper/datadog_checks/gatekeeper/data/auto_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ instances:
prometheus_url: http://%%host%%:8888/metrics

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ instances:
prometheus_url: http://%%host%%:8888/metrics

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down
6 changes: 3 additions & 3 deletions open_policy_agent/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ files:
options:
- template: init_config
options:
- template: init_config/openmetrics
- template: init_config/openmetrics_legacy
- template: instances
options:
- name: opa_url
Expand All @@ -13,7 +13,7 @@ files:
value:
type: string
example: http://%%host%%:8181
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.value.example: http://%%host%%:8181/metrics

Expand All @@ -33,6 +33,6 @@ files:
value:
type: string
example: http://%%host%%:8181
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.value.example: http://%%host%%:8181/metrics
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ instances:
prometheus_url: http://%%host%%:8181/metrics

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ instances:
prometheus_url: http://%%host%%:8181/metrics

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down
4 changes: 2 additions & 2 deletions pulsar/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ files:
options:
- template: init_config
options:
- template: init_config/openmetrics
- template: init_config/openmetrics_legacy
- template: instances
options:
- template: instances/openmetrics
- template: instances/openmetrics_legacy
overrides:
prometheus_url.value.example: http://localhost:9090/metrics
prometheus_url.display_priority: 1
Expand Down
2 changes: 1 addition & 1 deletion pulsar/datadog_checks/pulsar/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ instances:
- prometheus_url: http://localhost:9090/metrics

## @param prometheus_metrics_prefix - string - optional
## <PREFIX> for exposed Prometheus metrics.
## Removes a given <PREFIX> from exposed Prometheus metrics.
#
# prometheus_metrics_prefix: <PREFIX>_

Expand Down

0 comments on commit d34ba3f

Please sign in to comment.