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

fix: Add unit to intervals attribute #1003

Merged
merged 2 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/apache/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ install:
# versus remote entities:
# https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
REMOTE_MONITORING: true
interval: 15
interval: 15s

- name: nri-apache
env:
Expand All @@ -134,7 +134,7 @@ install:
# https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
REMOTE_MONITORING: true
inventory_source: config/apache
interval: 60
interval: 60s
EOT

restart:
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/apache/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ install:
# versus remote entities:
# https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
REMOTE_MONITORING: true
interval: 15
interval: 15s

- name: nri-apache
env:
Expand All @@ -190,7 +190,7 @@ install:
# https://github.com/newrelic/infra-integrations-sdk/blob/master/docs/entity-definition.md
REMOTE_MONITORING: true
inventory_source: config/apache
interval: 60
interval: 60s

EOT

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/cassandra/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ install:
USERNAME: {{.NR_CLI_DB_USERNAME}}
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
REMOTE_MONITORING: true
interval: 30
interval: 30s
- name: nri-cassandra
env:
INVENTORY: true
HOSTNAME: {{.NR_CLI_DB_HOSTNAME}}
CONFIG_PATH: /etc/cassandra/cassandra.yaml
REMOTE_MONITORING: true
inventory_source: config/cassandra
interval: 60
interval: 60s
EOT

restart:
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ install:
USERNAME: {{.NR_CLI_DB_USERNAME}}
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
REMOTE_MONITORING: true
interval: 30
interval: 30s
- name: nri-cassandra
env:
INVENTORY: true
HOSTNAME: {{.NR_CLI_DB_HOSTNAME}}
CONFIG_PATH: /etc/cassandra/conf/cassandra.yaml
REMOTE_MONITORING: true
inventory_source: config/cassandra
interval: 60
interval: 60s
EOT

restart:
Expand Down
8 changes: 4 additions & 4 deletions recipes/newrelic/infrastructure/ohi/consul/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ install:
PORT: {{.NR_CLI_PORT}}
ENABLE_SSL: {{.NR_CLI_ENABLE_SSL}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/consul-config.yml > /dev/null <<"EOT"
Expand All @@ -121,7 +121,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_FILE_DIR}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
fi
else
Expand All @@ -135,7 +135,7 @@ install:
TOKEN: {{.NR_CLI_TOKEN}}
ENABLE_SSL: {{.NR_CLI_ENABLE_SSL}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/consul-config.yml > /dev/null <<"EOT"
Expand All @@ -150,7 +150,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_FILE_DIR}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
fi
fi
Expand Down
8 changes: 4 additions & 4 deletions recipes/newrelic/infrastructure/ohi/consul/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ install:
PORT: {{.NR_CLI_PORT}}
ENABLE_SSL: {{.NR_CLI_ENABLE_SSL}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/consul-config.yml > /dev/null <<"EOT"
Expand All @@ -121,7 +121,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_FILE_DIR}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
fi
else
Expand All @@ -135,7 +135,7 @@ install:
TOKEN: {{.NR_CLI_TOKEN}}
ENABLE_SSL: {{.NR_CLI_ENABLE_SSL}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/consul-config.yml > /dev/null <<"EOT"
Expand All @@ -150,7 +150,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_FILE_DIR}}
inventory_source: config/consul
interval: 15
interval: 15s
EOT
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/couchbase/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ install:
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
USE_SSL: {{.NR_CLI_API_USE_SSL}}
inventory_source: config/couchbase
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/couchbase-config.yml > /dev/null <<"EOT"
Expand All @@ -130,7 +130,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_API_CA_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_API_CA_BUNDLE_FILE}}
inventory_source: config/couchbase
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ install:
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
USE_SSL: {{.NR_CLI_API_USE_SSL}}
inventory_source: config/couchbase
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/couchbase-config.yml > /dev/null <<"EOT"
Expand All @@ -134,7 +134,7 @@ install:
CA_BUNDLE_DIR: {{.NR_CLI_API_CA_BUNDLE_DIR}}
CA_BUNDLE_FILE: {{.NR_CLI_API_CA_BUNDLE_FILE}}
inventory_source: config/couchbase
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/elasticsearch-config.yml > /dev/null <<"EOT"
Expand All @@ -158,7 +158,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/elasticsearch-config.yml > /dev/null <<"EOT"
Expand All @@ -160,7 +160,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/elasticsearch-config.yml > /dev/null <<"EOT"
Expand All @@ -154,7 +154,7 @@ install:
COLLECT_INDICES: true
COLLECT_PRIMARIES: true
inventory_source: config/elasticsearch
interval: 15
interval: 15s
EOT
fi

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ohi/haproxy/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ install:
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
CLUSTER_NAME: {{.NR_CLI_CLUSTER_NAME}}
inventory_source: config/haproxy
interval: 15
interval: 15s
EOT

restart:
Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ install:
PASSWORD: {{.NR_CLI_DB_PASSWORD}}
CLUSTER_NAME: {{.NR_CLI_CLUSTER_NAME}}
inventory_source: config/haproxy
interval: 15
interval: 15s
EOT
- |
sudo systemctl restart newrelic-infra.service
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/memcached/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ install:
HOST: {{.NR_CLI_DB_HOSTNAME}}
PORT: $NR_CLI_DB_PORT
inventory_source: config/memcached
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/memcached-config.yml > /dev/null <<EOT
Expand All @@ -122,7 +122,7 @@ install:
# authentication is enabled.
PASSWORD: '$NR_CLI_DB_PASSWORD'
inventory_source: config/memcached
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/memcached/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ install:
HOST: {{.NR_CLI_DB_HOSTNAME}}
PORT: $NR_CLI_DB_PORT
inventory_source: config/memcached
interval: 15
interval: 15s
EOT
else
sudo tee /etc/newrelic-infra/integrations.d/memcached-config.yml > /dev/null <<EOT
Expand All @@ -123,7 +123,7 @@ install:
# authentication is enabled.
PASSWORD: '$NR_CLI_DB_PASSWORD'
inventory_source: config/memcached
interval: 15
interval: 15s
EOT
fi

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ohi/mysql/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ install:
EXTENDED_MYISAM_METRICS: true
REMOTE_MONITORING: true
inventory_source: config/mysql
interval: 30
interval: 30s
EOT

collect_meta:
Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ohi/mysql/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ install:
EXTENDED_MYISAM_METRICS: true
REMOTE_MONITORING: true
inventory_source: config/mysql
interval: 30
interval: 30s
EOT

restart:
Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ohi/mysql/suse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ install:
EXTENDED_MYISAM_METRICS: true
REMOTE_MONITORING: true
inventory_source: config/mysql
interval: 30
interval: 30s
EOT

restart:
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/nginx/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ install:

# default true. If the status URL is HTTPS with a self-signed certificate, set this to false if you want to avoid certificate validation
# VALIDATE_CERTS: true
interval: 30
interval: 30s

- name: nri-nginx
env:
Expand All @@ -219,7 +219,7 @@ install:
# status_url is used to identify the monitored entity to which the inventory will be attached.
STATUS_URL: $NR_CLI_STUB_STATUS_URL
inventory_source: config/nginx
interval: 60
interval: 60s

EOT

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/nginx/suse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ install:

# default true. If the status URL is HTTPS with a self-signed certificate, set this to false if you want to avoid certificate validation
# VALIDATE_CERTS: true
interval: 30
interval: 30s

- name: nri-nginx
env:
Expand All @@ -196,7 +196,7 @@ install:
# status_url is used to identify the monitored entity to which the inventory will be attached.
STATUS_URL: $NR_CLI_STUB_STATUS_URL
inventory_source: config/nginx
interval: 60
interval: 60s
EOT

restart:
Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/postgres/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ install:
SSL_KEY_LOCATION: $NR_CLI_CERT_KEY
TIMEOUT: 10
inventory_source: config/postgresql
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/postgresql-config.yml > /dev/null <<EOT
Expand All @@ -280,7 +280,7 @@ install:
ENABLE_SSL: false
TIMEOUT: 10
inventory_source: config/postgresql
interval: 15
interval: 15s
EOT
fi

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/infrastructure/ohi/postgres/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ install:
SSL_KEY_LOCATION: $NR_CLI_CERT_KEY
TIMEOUT: 10
inventory_source: config/postgresql
interval: 15
interval: 15s
EOT
else
sudo tee -a /etc/newrelic-infra/integrations.d/postgresql-config.yml > /dev/null <<EOT
Expand All @@ -277,7 +277,7 @@ install:
ENABLE_SSL: false
TIMEOUT: 10
inventory_source: config/postgresql
interval: 15
interval: 15s
EOT
fi

Expand Down
Loading
Loading