fix: Add unit to intervals attribute (#1003)

NRhzhao · web-flow · commit 64b0d8f2131b · 2023-12-14T15:19:45.000-08:00
diff --git a/recipes/newrelic/infrastructure/ohi/apache/debian.yml b/recipes/newrelic/infrastructure/ohi/apache/debian.yml
@@ -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:
@@ -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:
diff --git a/recipes/newrelic/infrastructure/ohi/apache/rhel.yml b/recipes/newrelic/infrastructure/ohi/apache/rhel.yml
@@ -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:
@@ -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
 
diff --git a/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml b/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml
@@ -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:
diff --git a/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml b/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml
@@ -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:
diff --git a/recipes/newrelic/infrastructure/ohi/consul/debian.yml b/recipes/newrelic/infrastructure/ohi/consul/debian.yml
@@ -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"
@@ -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
@@ -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"
@@ -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
diff --git a/recipes/newrelic/infrastructure/ohi/consul/rhel.yml b/recipes/newrelic/infrastructure/ohi/consul/rhel.yml
@@ -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"
@@ -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
@@ -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"
@@ -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
diff --git a/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml b/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml
@@ -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"
@@ -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
 
diff --git a/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml b/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml
@@ -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"
@@ -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
 
diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml
@@ -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"
@@ -158,7 +158,7 @@ install:
                 COLLECT_INDICES: true
                 COLLECT_PRIMARIES: true
               inventory_source: config/elasticsearch
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml
@@ -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"
@@ -160,7 +160,7 @@ install:
                 COLLECT_INDICES: true
                 COLLECT_PRIMARIES: true
               inventory_source: config/elasticsearch
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml
@@ -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"
@@ -154,7 +154,7 @@ install:
                 COLLECT_INDICES: true
                 COLLECT_PRIMARIES: true
               inventory_source: config/elasticsearch
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml b/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml
@@ -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:
diff --git a/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml b/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml
@@ -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
diff --git a/recipes/newrelic/infrastructure/ohi/memcached/debian.yml b/recipes/newrelic/infrastructure/ohi/memcached/debian.yml
@@ -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
@@ -122,7 +122,7 @@ install:
                 # authentication is enabled.
                 PASSWORD: '$NR_CLI_DB_PASSWORD'
               inventory_source: config/memcached
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml b/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml
@@ -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
@@ -123,7 +123,7 @@ install:
                 # authentication is enabled.
                 PASSWORD: '$NR_CLI_DB_PASSWORD'
               inventory_source: config/memcached
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/mysql/debian.yml b/recipes/newrelic/infrastructure/ohi/mysql/debian.yml
@@ -262,7 +262,7 @@ install:
                 EXTENDED_MYISAM_METRICS: true
                 REMOTE_MONITORING: true
               inventory_source: config/mysql
-              interval: 30
+              interval: 30s
           EOT
 
     collect_meta:
diff --git a/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml b/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml
@@ -252,7 +252,7 @@ install:
                 EXTENDED_MYISAM_METRICS: true
                 REMOTE_MONITORING: true
               inventory_source: config/mysql
-              interval: 30
+              interval: 30s
           EOT
 
     restart:
diff --git a/recipes/newrelic/infrastructure/ohi/mysql/suse.yml b/recipes/newrelic/infrastructure/ohi/mysql/suse.yml
@@ -244,7 +244,7 @@ install:
                 EXTENDED_MYISAM_METRICS: true
                 REMOTE_MONITORING: true
               inventory_source: config/mysql
-              interval: 30
+              interval: 30s
           EOT
 
     restart:
diff --git a/recipes/newrelic/infrastructure/ohi/nginx/linux.yml b/recipes/newrelic/infrastructure/ohi/nginx/linux.yml
@@ -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:
@@ -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
 
diff --git a/recipes/newrelic/infrastructure/ohi/nginx/suse.yml b/recipes/newrelic/infrastructure/ohi/nginx/suse.yml
@@ -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:
@@ -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:
diff --git a/recipes/newrelic/infrastructure/ohi/postgres/debian.yml b/recipes/newrelic/infrastructure/ohi/postgres/debian.yml
@@ -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
@@ -280,7 +280,7 @@ install:
                 ENABLE_SSL: false
                 TIMEOUT: 10
               inventory_source: config/postgresql
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml b/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml
@@ -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
@@ -277,7 +277,7 @@ install:
                 ENABLE_SSL: false
                 TIMEOUT: 10
               inventory_source: config/postgresql
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml
diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml
diff --git a/recipes/newrelic/infrastructure/ohi/redis/debian.yml b/recipes/newrelic/infrastructure/ohi/redis/debian.yml
diff --git a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml
diff --git a/recipes/newrelic/infrastructure/ohi/varnish/debian.yml b/recipes/newrelic/infrastructure/ohi/varnish/debian.yml
diff --git a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml
