diff --git a/recipes/newrelic/infrastructure/ohi/apache/debian.yml b/recipes/newrelic/infrastructure/ohi/apache/debian.yml index d632b5d25..0daadad3b 100644 --- a/recipes/newrelic/infrastructure/ohi/apache/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/apache/debian.yml @@ -30,8 +30,12 @@ logMatch: - name: apache error file: /var/log/apache2/error.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: apache + +# DEPRECATED validationNrql: "SELECT count(*) from ApacheSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/apache/rhel.yml b/recipes/newrelic/infrastructure/ohi/apache/rhel.yml index 084cd7e96..6cc521130 100644 --- a/recipes/newrelic/infrastructure/ohi/apache/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/apache/rhel.yml @@ -39,8 +39,12 @@ logMatch: - name: apache error file: /var/log/httpd/*error_log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: apache + +# DEPRECATED validationNrql: "SELECT count(*) from ApacheSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml b/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml index 96a8a0a5a..8874d7db4 100644 --- a/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/cassandra/debian.yml @@ -36,6 +36,12 @@ logMatch: - name: cassandra-debug file: /var/log/cassandra/debug.log* +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: cassandra + +# DEPRECATED validationNrql: "SELECT count(*) from CassandraSample SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml b/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml index 5fa934a8c..d6735cd22 100644 --- a/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml @@ -40,6 +40,12 @@ logMatch: - name: cassandra-debug file: /var/log/cassandra/debug.log* +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: cassandra + +# DEPRECATED validationNrql: "SELECT count(*) from CassandraSample SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/consul/debian.yml b/recipes/newrelic/infrastructure/ohi/consul/debian.yml index ee6bbcabb..10f0e8aa5 100644 --- a/recipes/newrelic/infrastructure/ohi/consul/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/consul/debian.yml @@ -25,8 +25,12 @@ keywords: processMatch: - consul -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: consul + +# DEPRECATED validationNrql: "SELECT count(*) from ConsulAgentSample FACET entityGuid SINCE 20 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" # Prompts for input from the user. These variables then become diff --git a/recipes/newrelic/infrastructure/ohi/consul/rhel.yml b/recipes/newrelic/infrastructure/ohi/consul/rhel.yml index b83390fcc..4b8f664ea 100644 --- a/recipes/newrelic/infrastructure/ohi/consul/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/consul/rhel.yml @@ -28,8 +28,12 @@ keywords: processMatch: - consul -# Matches partial list of the Log forwarding parameters +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: consul +# DEPRECATED validationNrql: "SELECT count(*) from ConsulAgentSample FACET entityGuid SINCE 20 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml b/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml index 8954e231d..59985048e 100644 --- a/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/couchbase/debian.yml @@ -31,6 +31,12 @@ logMatch: - name: Couchbase General file: /opt/couchbase/var/lib/couchbase/logs/couchdb.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: couchbase + +# DEPRECATED validationNrql: "SELECT count(*) from CouchbaseNodeSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml b/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml index 922781b82..277c0f7f3 100644 --- a/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml @@ -35,6 +35,12 @@ logMatch: - name: Couchbase General file: /opt/couchbase/var/lib/couchbase/logs/couchdb.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: couchbase + +# DEPRECATED validationNrql: "SELECT count(*) from CouchbaseNodeSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml index 7d6d51d15..f95434023 100644 --- a/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/elasticsearch/debian.yml @@ -30,6 +30,12 @@ logMatch: - name: elasticsearch file: /var/log/elasticsearch/elasticsearch*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: elasticsearch + +# DEPRECATED validationNrql: "SELECT count(*) from ElasticsearchClusterSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml index 6e0100ed3..30f0eb887 100644 --- a/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml @@ -33,6 +33,12 @@ logMatch: - name: elasticsearch file: /var/log/elasticsearch/elasticsearch*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: elasticsearch + +# DEPRECATED validationNrql: "SELECT count(*) from ElasticsearchClusterSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml index bcb8f0e94..db5bc7b4a 100644 --- a/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml +++ b/recipes/newrelic/infrastructure/ohi/elasticsearch/suse.yml @@ -27,6 +27,12 @@ logMatch: - name: elasticsearch file: /var/log/elasticsearch/elasticsearch*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: elasticsearch + +# DEPRECATED validationNrql: "SELECT count(*) from ElasticsearchClusterSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml b/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml index e49b2d3ee..5a0e75bbe 100644 --- a/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/haproxy/debian.yml @@ -29,6 +29,12 @@ logMatch: - name: haproxy file: /var/log/haproxy.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: haproxy + +# DEPRECATED validationNrql: "SELECT count(*) from HAProxyBackendSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml b/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml index 086363281..9a79255bd 100644 --- a/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml @@ -33,6 +33,12 @@ logMatch: - name: haproxy file: /var/log/haproxy.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: haproxy + +# DEPRECATED validationNrql: "SELECT count(*) from HAProxyBackendSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/memcached/debian.yml b/recipes/newrelic/infrastructure/ohi/memcached/debian.yml index 42398effb..fcafa8d79 100644 --- a/recipes/newrelic/infrastructure/ohi/memcached/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/memcached/debian.yml @@ -33,8 +33,12 @@ logMatch: - name: memcached file: /var/log/memcached.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: memcached + +# DEPRECATED validationNrql: "SELECT count(*) from MemcachedSample FACET entityGuid SINCE 10 minutes ago" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml b/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml index 8cd936b9b..40356cf00 100644 --- a/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml @@ -35,6 +35,12 @@ processMatch: # - name: memcached # file: /var/log/memcached/*access_log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: memcached + +# DEPRECATED validationNrql: "SELECT count(*) from MemcachedSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/mongodb/debian.yml b/recipes/newrelic/infrastructure/ohi/mongodb/debian.yml index afce5e5da..24b9d29c5 100644 --- a/recipes/newrelic/infrastructure/ohi/mongodb/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/mongodb/debian.yml @@ -35,8 +35,12 @@ logMatch: - name: MongoDB log file: /var/log/mongodb/mongod.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mongodb3 + +# DEPRECATED validationNrql: "SELECT count(*) FROM Metric WHERE entity.type = 'MONGODB_INSTANCE' SINCE 10 minutes ago WHERE targetName LIKE '{{.INFRA_KEY}}%'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml b/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml index 858b13fe7..7a9c7d6bd 100644 --- a/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml @@ -35,6 +35,12 @@ logMatch: - name: MongoDB log file: /var/log/mongodb/mongod.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mongodb3 + +# DEPRECATED validationNrql: "SELECT count(*) FROM Metric WHERE entity.type = 'MONGODB_INSTANCE' SINCE 10 minutes ago WHERE targetName LIKE '{{.INFRA_KEY}}%'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/mysql/debian.yml b/recipes/newrelic/infrastructure/ohi/mysql/debian.yml index 47ee818b8..cb842f834 100644 --- a/recipes/newrelic/infrastructure/ohi/mysql/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/mysql/debian.yml @@ -52,8 +52,12 @@ logMatch: attributes: logtype: mysql-error -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mysql + +# DEPRECATED validationNrql: "SELECT count(*) from MysqlSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml b/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml index 90c27da1e..2c9d34d1f 100644 --- a/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/mysql/rhel.yml @@ -51,8 +51,12 @@ logMatch: - name: mysql file: /var/log/mysqld.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mysql + +# DEPRECATED validationNrql: "SELECT count(*) from MysqlSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/mysql/suse.yml b/recipes/newrelic/infrastructure/ohi/mysql/suse.yml index 9668b36d6..816578fb8 100644 --- a/recipes/newrelic/infrastructure/ohi/mysql/suse.yml +++ b/recipes/newrelic/infrastructure/ohi/mysql/suse.yml @@ -34,8 +34,12 @@ logMatch: attributes: logtype: mysql-error -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mysql + +# DEPRECATED validationNrql: "SELECT count(*) from MysqlSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/nagios/debian.yml b/recipes/newrelic/infrastructure/ohi/nagios/debian.yml index 160c88d10..9a9cc0256 100644 --- a/recipes/newrelic/infrastructure/ohi/nagios/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/nagios/debian.yml @@ -30,8 +30,12 @@ logMatch: - name: nagios file: /usr/local/nagios/var/nagios.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: nagios + +# DEPRECATED validationNrql: "SELECT count(*) from NagiosServiceCheckSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml b/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml index b092db549..d0515963f 100644 --- a/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml @@ -30,6 +30,12 @@ logMatch: - name: nagios file: /usr/local/nagios/var/nagios.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: nagios + +# DEPRECATED validationNrql: "SELECT count(*) from NagiosServiceCheckSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/nginx/linux.yml b/recipes/newrelic/infrastructure/ohi/nginx/linux.yml index 20e673d5e..f355c72a8 100644 --- a/recipes/newrelic/infrastructure/ohi/nginx/linux.yml +++ b/recipes/newrelic/infrastructure/ohi/nginx/linux.yml @@ -45,6 +45,12 @@ logMatch: attributes: logtype: nginx-error +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: nginx + +# DEPRECATED validationNrql: "SELECT count(*) from NginxSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/nginx/suse.yml b/recipes/newrelic/infrastructure/ohi/nginx/suse.yml index 0ec29c9aa..d65a4855d 100644 --- a/recipes/newrelic/infrastructure/ohi/nginx/suse.yml +++ b/recipes/newrelic/infrastructure/ohi/nginx/suse.yml @@ -32,6 +32,12 @@ logMatch: attributes: logtype: nginx-error +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: nginx + +# DEPRECATED validationNrql: "SELECT count(*) from NginxSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/postgres/debian.yml b/recipes/newrelic/infrastructure/ohi/postgres/debian.yml index 7ccab2f4b..5972b3770 100644 --- a/recipes/newrelic/infrastructure/ohi/postgres/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/postgres/debian.yml @@ -29,6 +29,12 @@ logMatch: - name: postgresql file: /var/log/postgresql/postgresql*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: postgres + +# DEPRECATED validationNrql: "SELECT count(*) from PostgresqlDatabaseSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml b/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml index fc9088c23..38acdd9da 100644 --- a/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml @@ -36,6 +36,12 @@ logMatch: - name: postgresql file: /var/log/postgresql/postgresql*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: postgres + +# DEPRECATED validationNrql: "SELECT count(*) from PostgresqlDatabaseSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml index 404b8a4f1..33175ae30 100644 --- a/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/rabbitmq/debian.yml @@ -32,6 +32,12 @@ logMatch: - name: Logs file: /var/log/rabbitmq/*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: rabbitmq + +# DEPRECATED validationNrql: "SELECT count(*) from RabbitmqVhostSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml index f63514f66..a6665b328 100644 --- a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml @@ -36,6 +36,12 @@ logMatch: - name: rabbitmq file: /var/log/rabbitmq/*.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: rabbitmq + +# DEPRECATED validationNrql: "SELECT count(*) from RabbitmqNodeSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/redis/debian.yml b/recipes/newrelic/infrastructure/ohi/redis/debian.yml index 45472c08d..c5f21c1cc 100644 --- a/recipes/newrelic/infrastructure/ohi/redis/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/redis/debian.yml @@ -37,8 +37,12 @@ logMatch: attributes: logtype: redis -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: redis + +# DEPRECATED validationNrql: "SELECT count(*) from RedisSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml index 5f3226a35..45d88a6d5 100644 --- a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml @@ -40,9 +40,12 @@ logMatch: attributes: logtype: redis +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: redis -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# DEPRECATED validationNrql: "SELECT count(*) from RedisSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" successLinkConfig: diff --git a/recipes/newrelic/infrastructure/ohi/sql/ms-linux.yml b/recipes/newrelic/infrastructure/ohi/sql/ms-linux.yml index 7b40645a7..e0f818d41 100644 --- a/recipes/newrelic/infrastructure/ohi/sql/ms-linux.yml +++ b/recipes/newrelic/infrastructure/ohi/sql/ms-linux.yml @@ -21,6 +21,12 @@ keywords: processMatch: - sqlservr +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mssql + +# DEPRECATED validationNrql: "SELECT count(*) from MssqlInstanceSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/sql/ms-sql.yml b/recipes/newrelic/infrastructure/ohi/sql/ms-sql.yml index 51e347905..8a5489962 100644 --- a/recipes/newrelic/infrastructure/ohi/sql/ms-sql.yml +++ b/recipes/newrelic/infrastructure/ohi/sql/ms-sql.yml @@ -21,6 +21,12 @@ keywords: processMatch: - sqlservr.exe +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: mssql + +# DEPRECATED validationNrql: "SELECT count(*) from MssqlInstanceSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" preInstall: diff --git a/recipes/newrelic/infrastructure/ohi/varnish/debian.yml b/recipes/newrelic/infrastructure/ohi/varnish/debian.yml index c6eed0641..a474e957e 100644 --- a/recipes/newrelic/infrastructure/ohi/varnish/debian.yml +++ b/recipes/newrelic/infrastructure/ohi/varnish/debian.yml @@ -29,6 +29,12 @@ logMatch: - name: Logs file: /var/log/varnish/varnishcna.log +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: varnish + +# DEPRECATED validationNrql: "SELECT count(*) from VarnishSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: diff --git a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml index 18184ea21..a3765dfa3 100644 --- a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml +++ b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml @@ -33,8 +33,12 @@ logMatch: - name: Logs file: /var/log/varnish/varnishcna.log -# NRQL the newrelic-cli will use to validate the agent/integration this recipe -# installed is successfully sending data to New Relic +# The newrelic-cli will use this integration name to check the config file(s) +# that were setup during the installation to ensure the integration +# runs properly with the defined environment variables +validationIntegration: varnish + +# DEPRECATED validationNrql: "SELECT count(*) from VarnishSample FACET entityGuid SINCE 10 minutes ago WHERE reportingAgent = '{{.INFRA_KEY}}'" inputVars: