From 64b0d8f2131b7e605c8faac053e07573ed992b20 Mon Sep 17 00:00:00 2001
From: NRhzhao <hzhao@newrelic.com>
Date: Thu, 14 Dec 2023 15:19:45 -0800
Subject: [PATCH] fix: Add unit to intervals attribute (#1003)

---
 recipes/newrelic/infrastructure/ohi/apache/debian.yml     | 4 ++--
 recipes/newrelic/infrastructure/ohi/apache/rhel.yml       | 4 ++--
 recipes/newrelic/infrastructure/ohi/cassandra/debian.yml  | 4 ++--
 recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml    | 4 ++--
 recipes/newrelic/infrastructure/ohi/consul/debian.yml     | 8 ++++----
 recipes/newrelic/infrastructure/ohi/consul/rhel.yml       | 8 ++++----
 recipes/newrelic/infrastructure/ohi/couchbase/debian.yml  | 4 ++--
 recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml    | 4 ++--
 .../newrelic/infrastructure/ohi/elasticsearch/debian.yml  | 4 ++--
 .../newrelic/infrastructure/ohi/elasticsearch/rhel.yml    | 4 ++--
 .../newrelic/infrastructure/ohi/elasticsearch/suse.yml    | 4 ++--
 recipes/newrelic/infrastructure/ohi/haproxy/debian.yml    | 2 +-
 recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml      | 2 +-
 recipes/newrelic/infrastructure/ohi/memcached/debian.yml  | 4 ++--
 recipes/newrelic/infrastructure/ohi/memcached/rhel.yml    | 4 ++--
 recipes/newrelic/infrastructure/ohi/mysql/debian.yml      | 2 +-
 recipes/newrelic/infrastructure/ohi/mysql/rhel.yml        | 2 +-
 recipes/newrelic/infrastructure/ohi/mysql/suse.yml        | 2 +-
 recipes/newrelic/infrastructure/ohi/nginx/linux.yml       | 4 ++--
 recipes/newrelic/infrastructure/ohi/nginx/suse.yml        | 4 ++--
 recipes/newrelic/infrastructure/ohi/postgres/debian.yml   | 4 ++--
 recipes/newrelic/infrastructure/ohi/postgres/rhel.yml     | 4 ++--
 recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml   | 4 ++--
 recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml     | 4 ++--
 recipes/newrelic/infrastructure/ohi/redis/debian.yml      | 4 ++--
 recipes/newrelic/infrastructure/ohi/redis/rhel.yml        | 4 ++--
 recipes/newrelic/infrastructure/ohi/varnish/debian.yml    | 4 ++--
 recipes/newrelic/infrastructure/ohi/varnish/rhel.yml      | 4 ++--
 28 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/recipes/newrelic/infrastructure/ohi/apache/debian.yml b/recipes/newrelic/infrastructure/ohi/apache/debian.yml
index 0daadad3b..b6371536f 100644
--- 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
index 6cc521130..2ddd48330 100644
--- 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
index faf3747e8..1ab96492e 100644
--- a/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml
+++ b/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml
@@ -114,7 +114,7 @@ install:
                 USERNAME: {{.NR_CLI_DB_USERNAME}}
                 PASSWORD: {{.NR_CLI_DB_PASSWORD}}
                 REMOTE_MONITORING: true
-              interval: 30
+              interval: 30s
             - name: nri-cassandra
               env:
                 INVENTORY: true
@@ -122,7 +122,7 @@ install:
                 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
index 3cbcc9888..7abd865a0 100644
--- a/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml
+++ b/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml
@@ -117,7 +117,7 @@ install:
                 USERNAME: {{.NR_CLI_DB_USERNAME}}
                 PASSWORD: {{.NR_CLI_DB_PASSWORD}}
                 REMOTE_MONITORING: true
-              interval: 30
+              interval: 30s
             - name: nri-cassandra
               env:
                 INVENTORY: true
@@ -125,7 +125,7 @@ install:
                 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
index 10f0e8aa5..4e7a412bb 100644
--- 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
index 4b8f664ea..4ed7e8499 100644
--- 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
index 59985048e..b4e24b923 100644
--- 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
index 277c0f7f3..da997e331 100644
--- 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
index f95434023..482568038 100644
--- 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
index 30f0eb887..a62dea671 100644
--- 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
index db5bc7b4a..4d3729bf5 100644
--- 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
index 5a0e75bbe..7d43f1f0b 100644
--- 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
index 9a79255bd..83674baef 100644
--- 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
index fcafa8d79..6b554cba5 100644
--- 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
index 40356cf00..6c80cd71d 100644
--- 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
index 238bf61fb..34f1347a7 100644
--- 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
index 2c9d34d1f..48b1be6bc 100644
--- 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
index 816578fb8..27f7ef162 100644
--- 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
index f355c72a8..c02b627ac 100644
--- 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
index d65a4855d..dae0f3755 100644
--- 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
index 30bdabba6..431d190f3 100644
--- 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
index 8a1811b98..3767f4156 100644
--- 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
index 33175ae30..7cbe553f5 100644
--- a/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml
+++ b/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml
@@ -162,7 +162,7 @@ install:
                   VHOSTS: {{.NR_CLI_VHOSTS}}
                   VHOSTS_REGEXES: {{.NR_CLI_VHOSTS_REGEXES}}
                 inventory_source: config/rabbitmq
-                interval: 15
+                interval: 15s
           EOT
           else
             if [ -z {{.NR_CLI_API_CA_BUNDLE_DIR}} ]; then
@@ -190,7 +190,7 @@ install:
                   VHOSTS: {{.NR_CLI_VHOSTS}}
                   VHOSTS_REGEXES: {{.NR_CLI_VHOSTS_REGEXES}}
                 inventory_source: config/rabbitmq
-                interval: 15
+                interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml
index a6665b328..90c9c4c07 100644
--- a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml
+++ b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml
@@ -156,7 +156,7 @@ install:
                   VHOSTS: {{.NR_CLI_VHOSTS}}
                   VHOSTS_REGEXES: {{.NR_CLI_VHOSTS_REGEXES}}
                 inventory_source: config/rabbitmq
-                interval: 15
+                interval: 15s
           EOT
           else
             if [ -z {{.NR_CLI_API_CA_BUNDLE_DIR}} ]; then
@@ -184,7 +184,7 @@ install:
                   VHOSTS: {{.NR_CLI_VHOSTS}}
                   VHOSTS_REGEXES: {{.NR_CLI_VHOSTS_REGEXES}}
                 inventory_source: config/rabbitmq
-                interval: 15
+                interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/redis/debian.yml b/recipes/newrelic/infrastructure/ohi/redis/debian.yml
index c5f21c1cc..261f298c0 100644
--- a/recipes/newrelic/infrastructure/ohi/redis/debian.yml
+++ b/recipes/newrelic/infrastructure/ohi/redis/debian.yml
@@ -187,7 +187,7 @@ install:
                 # New users should leave this property as 'true', to uniquely identify the monitored entities when using
                 # Unix sockets. It requires UNIX_SOCKET_PATH
                 USE_UNIX_SOCKET: false
-              interval: 15
+              interval: 15s
 
             - name: nri-redis
               env:
@@ -209,7 +209,7 @@ install:
                 # Unix sockets. It requires UNIX_SOCKET_PATH
                 USE_UNIX_SOCKET: false
               inventory_source: config/redis
-              interval: 60
+              interval: 60s
           EOT
 
     restart:
diff --git a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml
index 45d88a6d5..1d1c49db8 100644
--- a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml
+++ b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml
@@ -180,7 +180,7 @@ install:
                 # New users should leave this property as 'true', to uniquely identify the monitored entities when using
                 # Unix sockets. It requires UNIX_SOCKET_PATH
                 USE_UNIX_SOCKET: false
-              interval: 15
+              interval: 15s
 
             - name: nri-redis
               env:
@@ -202,7 +202,7 @@ install:
                 # Unix sockets. It requires UNIX_SOCKET_PATH
                 USE_UNIX_SOCKET: false
               inventory_source: config/redis
-              interval: 60
+              interval: 60s
           EOT
 
     restart:
diff --git a/recipes/newrelic/infrastructure/ohi/varnish/debian.yml b/recipes/newrelic/infrastructure/ohi/varnish/debian.yml
index a474e957e..ed6881010 100644
--- a/recipes/newrelic/infrastructure/ohi/varnish/debian.yml
+++ b/recipes/newrelic/infrastructure/ohi/varnish/debian.yml
@@ -94,7 +94,7 @@ install:
               env:
                 INSTANCE_NAME: {{.NR_CLI_INSTANCE_NAME}}
               inventory_source: config/varnish
-              interval: 15
+              interval: 15s
           EOT
           else
             sudo tee -a /etc/newrelic-infra/integrations.d/varnish-config.yml > /dev/null <<"EOT"
@@ -104,7 +104,7 @@ install:
                 INSTANCE_NAME: {{.NR_CLI_INSTANCE_NAME}}
                 PARAMS_CONFIG_FILE: {{.NR_CLI_PARAMS_CONFIG_FILE}}
               inventory_source: config/varnish
-              interval: 15
+              interval: 15s
           EOT
           fi
 
diff --git a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml
index a3765dfa3..782ce3029 100644
--- a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml
+++ b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml
@@ -98,7 +98,7 @@ install:
               env:
                 INSTANCE_NAME: {{.NR_CLI_INSTANCE_NAME}}
               inventory_source: config/varnish
-              interval: 15
+              interval: 15s
           EOT
           else
             sudo tee -a /etc/newrelic-infra/integrations.d/varnish-config.yml > /dev/null <<"EOT"
@@ -108,7 +108,7 @@ install:
                 INSTANCE_NAME: {{.NR_CLI_INSTANCE_NAME}}
                 PARAMS_CONFIG_FILE: {{.NR_CLI_PARAMS_CONFIG_FILE}}
               inventory_source: config/varnish
-              interval: 15
+              interval: 15s
           EOT
           fi