From b8f0d5517c6be377dbe1778cb4c13247c892b503 Mon Sep 17 00:00:00 2001
From: James Petersen <jpetersenames@gmail.com>
Date: Thu, 7 Dec 2023 16:23:27 -0700
Subject: [PATCH] configure the nri integrations to install files correctly

Signed-off-by: James Petersen <jpetersenames@gmail.com>
---
 nri-apache.yaml        | 13 ++++---------
 nri-cassandra.yaml     | 13 ++++---------
 nri-consul.yaml        | 13 ++++---------
 nri-couchbase.yaml     | 13 ++++---------
 nri-elasticsearch.yaml | 13 ++++---------
 nri-f5.yaml            | 13 ++++---------
 nri-haproxy.yaml       |  9 ++-------
 nri-jmx.yaml           |  9 ++-------
 nri-kafka.yaml         |  9 ++-------
 nri-memcached.yaml     |  9 ++-------
 nri-mongodb.yaml       |  9 ++-------
 nri-mssql.yaml         |  9 ++-------
 nri-mysql.yaml         |  9 ++-------
 nri-nagios.yaml        |  9 ++-------
 nri-nginx.yaml         |  9 ++-------
 nri-postgresql.yaml    |  5 ++---
 nri-rabbitmq.yaml      |  9 ++-------
 nri-redis.yaml         |  9 ++-------
 18 files changed, 48 insertions(+), 134 deletions(-)

diff --git a/nri-apache.yaml b/nri-apache.yaml
index 7613323b2f8..cc3dd5dd089 100644
--- a/nri-apache.yaml
+++ b/nri-apache.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-apache
   version: 1.12.1
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Apache Integration
   copyright:
     - license: Apache-2.0
@@ -28,11 +28,6 @@ pipeline:
       output: nri-apache
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 apache-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/apache-config.yml.sample
-      install -Dm644 legacy/apache-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/apache-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -40,9 +35,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/apache-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/apache-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/apache-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/apache-definition.yml
 
 update:
   enabled: true
diff --git a/nri-cassandra.yaml b/nri-cassandra.yaml
index 80f2ca684aa..7322cfaff53 100644
--- a/nri-cassandra.yaml
+++ b/nri-cassandra.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-cassandra
   version: 2.13.2
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Cassandra Integration
   copyright:
     - license: Apache-2.0
@@ -24,11 +24,6 @@ pipeline:
       output: nri-cassandra
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 cassandra-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/cassandra-config.yml.sample
-      install -Dm644 legacy/cassandra-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/cassandra-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -36,9 +31,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/cassandra-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/cassandra-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/cassandra-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/cassandra-definition.yml
 
 update:
   enabled: true
diff --git a/nri-consul.yaml b/nri-consul.yaml
index 8fd0ce84a69..8c6c49c4775 100644
--- a/nri-consul.yaml
+++ b/nri-consul.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-consul
   version: 2.7.3
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure Consul Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-consul
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 consul-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/consul-config.yml.sample
-      install -Dm644 legacy/consul-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/consul-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -32,9 +27,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/consul-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/consul-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/consul-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/consul-definition.yml
 
 update:
   enabled: true
diff --git a/nri-couchbase.yaml b/nri-couchbase.yaml
index c37502e644e..bea1a26abfe 100644
--- a/nri-couchbase.yaml
+++ b/nri-couchbase.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-couchbase
   version: 2.6.1
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Couchbase Integration
   copyright:
     - license: Apache-2.0
@@ -28,11 +28,6 @@ pipeline:
       output: nri-couchbase
       ldflags: -s -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 couchbase-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/couchbase-config.yml.sample
-      install -Dm644 legacy/couchbase-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/couchbase-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -40,9 +35,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/couchbase-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/couchbase-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/couchbase-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/couchbase-definition.yml
 
 update:
   enabled: true
diff --git a/nri-elasticsearch.yaml b/nri-elasticsearch.yaml
index 57d0a725969..f32ac337804 100644
--- a/nri-elasticsearch.yaml
+++ b/nri-elasticsearch.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-elasticsearch
   version: 5.2.2
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure Elasticsearch Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-elasticsearch
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 elasticsearch-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/elasticsearch-config.yml.sample
-      install -Dm644 legacy/elasticsearch-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/elasticsearch-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -32,9 +27,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/elasticsearch-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/elasticsearch-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/elasticsearch-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/elasticsearch-definition.yml
 
 update:
   enabled: true
diff --git a/nri-f5.yaml b/nri-f5.yaml
index 8942acecf98..1be45ec832c 100644
--- a/nri-f5.yaml
+++ b/nri-f5.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-f5
   version: 2.7.2
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure F5 Integration
   copyright:
     - license: Apache-2.0
@@ -28,11 +28,6 @@ pipeline:
       output: nri-f5
       ldflags: -s -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 f5-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/f5-config.yml.sample
-      install -Dm644 legacy/f5-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/f5-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -40,9 +35,9 @@ subpackages:
     description: "Compatibility package to place binaries in the location expected by newrelic-infrastructure-bundle"
     pipeline:
       - runs: |
-          mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
-          ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/f5-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/f5-definition.yml
+          mkdir -p ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin
+          ln -sf /usr/bin/${{package.name}} ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
+          install -Dm644 legacy/f5-definition.yml ${{targets.contextdir}}/var/db/newrelic-infra/newrelic-integrations/f5-definition.yml
 
 update:
   enabled: true
diff --git a/nri-haproxy.yaml b/nri-haproxy.yaml
index 9ad6108ba66..5c042f8bbe7 100644
--- a/nri-haproxy.yaml
+++ b/nri-haproxy.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-haproxy
   version: 2.5.1
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure HAproxy Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-haproxy
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 haproxy-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/haproxy-config.yml.sample
-      install -Dm644 legacy/haproxy-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/haproxy-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/haproxy-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/haproxy-definition.yml
+          install -Dm644 legacy/haproxy-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/haproxy-definition.yml
 
 update:
   enabled: true
diff --git a/nri-jmx.yaml b/nri-jmx.yaml
index cdaf0555932..b998ca91f21 100644
--- a/nri-jmx.yaml
+++ b/nri-jmx.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-jmx
   version: 3.5.0
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure JMX Integration
   copyright:
     - license: Apache-2.0
@@ -29,11 +29,6 @@ pipeline:
       output: nri-jmx
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 jmx-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/jmx-config.yml.sample
-      install -Dm644 legacy/jmx-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/jmx-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -43,7 +38,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/jmx-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/jmx-definition.yml
+          install -Dm644 legacy/jmx-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/jmx-definition.yml
 
 update:
   enabled: true
diff --git a/nri-kafka.yaml b/nri-kafka.yaml
index 8ee12d6c073..d2a5b3c276f 100644
--- a/nri-kafka.yaml
+++ b/nri-kafka.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-kafka
   version: 3.6.0
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure Kafka Integration
   copyright:
     - license: MIT
@@ -24,11 +24,6 @@ pipeline:
       output: nri-kafka
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 kafka-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/kafka-config.yml.sample
-      install -Dm644 legacy/kafka-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/kafka-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -38,7 +33,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/kafka-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/kafka-definition.yml
+          install -Dm644 legacy/kafka-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/kafka-definition.yml
 
 update:
   enabled: true
diff --git a/nri-memcached.yaml b/nri-memcached.yaml
index 7806d242a71..2eb0755d177 100644
--- a/nri-memcached.yaml
+++ b/nri-memcached.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-memcached
   version: 2.5.1
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure memcached Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-memcached
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 memcached-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/memcached-config.yml.sample
-      install -Dm644 legacy/memcached-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/memcached-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/memcached-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/memcached-definition.yml
+          install -Dm644 legacy/memcached-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/memcached-definition.yml
 
 update:
   enabled: true
diff --git a/nri-mongodb.yaml b/nri-mongodb.yaml
index d6efdb9dc81..923205ba627 100644
--- a/nri-mongodb.yaml
+++ b/nri-mongodb.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-mongodb
   version: 2.8.1
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure MongoDB Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-mongodb
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 mongodb-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mongodb-config.yml.sample
-      install -Dm644 legacy/mongodb-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mongodb-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/mongodb-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mongodb-definition.yml
+          install -Dm644 legacy/mongodb-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mongodb-definition.yml
 
 update:
   enabled: true
diff --git a/nri-mssql.yaml b/nri-mssql.yaml
index b0e40d1ebd5..2a63785d32b 100644
--- a/nri-mssql.yaml
+++ b/nri-mssql.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-mssql
   version: 2.10.2
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Mssql Integration
   copyright:
     - license: Apache-2.0
@@ -28,11 +28,6 @@ pipeline:
       output: nri-mssql
       ldflags: -s -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 mssql-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mssql-config.yml.sample
-      install -Dm644 legacy/mssql-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mssql-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -42,7 +37,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/mssql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mssql-definition.yml
+          install -Dm644 legacy/mssql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mssql-definition.yml
 
 update:
   enabled: true
diff --git a/nri-mysql.yaml b/nri-mysql.yaml
index 3089a20a877..c5877c262c6 100644
--- a/nri-mysql.yaml
+++ b/nri-mysql.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-mysql
   version: 1.10.2
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure MySQL Integration
   copyright:
     - license: Apache-2.0
@@ -20,11 +20,6 @@ pipeline:
       output: nri-mysql
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 mysql-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mysql-config.yml.sample
-      install -Dm644 legacy/mysql-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/mysql-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/mysql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mysql-definition.yml
+          install -Dm644 legacy/mysql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/mysql-definition.yml
 
 update:
   enabled: true
diff --git a/nri-nagios.yaml b/nri-nagios.yaml
index 3c67ab5662c..495e1b0e96b 100644
--- a/nri-nagios.yaml
+++ b/nri-nagios.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-nagios
   version: 2.9.1
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure Nagios Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-nagios
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 nagios-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/nagios-config.yml.sample
-      install -Dm644 legacy/nagios-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/nagios-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/nagios-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/nagios-definition.yml
+          install -Dm644 legacy/nagios-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/nagios-definition.yml
 
 update:
   enabled: true
diff --git a/nri-nginx.yaml b/nri-nginx.yaml
index 5b4a5a3def8..f96a63cbf27 100644
--- a/nri-nginx.yaml
+++ b/nri-nginx.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-nginx
   version: 3.4.1
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Nginx Integration
   copyright:
     - license: Apache-2.0
@@ -20,11 +20,6 @@ pipeline:
       output: nri-nginx
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 nginx-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/nginx-config.yml.sample
-      install -Dm644 legacy/nginx-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/nginx-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/nginx-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/nginx-definition.yml
+          install -Dm644 legacy/nginx-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/nginx-definition.yml
 
 update:
   enabled: true
diff --git a/nri-postgresql.yaml b/nri-postgresql.yaml
index 05d393cd40d..3e2bbb18af5 100644
--- a/nri-postgresql.yaml
+++ b/nri-postgresql.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-postgresql
   version: 2.13.0
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Postgresql Integration
   copyright:
     - license: MIT
@@ -23,7 +23,6 @@ pipeline:
   - runs: |
       mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
       install -Dm644 postgresql-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/postgresql-config.yml.sample
-      install -Dm644 legacy/postgresql-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/postgresql-definition.yml
 
   - uses: strip
 
@@ -34,7 +33,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/postgresql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/postgresql-definition.yml
+          install -Dm644 legacy/postgresql-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/postgresql-definition.yml
 
 update:
   enabled: true
diff --git a/nri-rabbitmq.yaml b/nri-rabbitmq.yaml
index e6c389a40f7..a998f04ce0a 100644
--- a/nri-rabbitmq.yaml
+++ b/nri-rabbitmq.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-rabbitmq
   version: 2.13.2
-  epoch: 2
+  epoch: 3
   description: New Relic Infrastructure RabbitMQ Integration
   copyright:
     - license: MIT
@@ -20,11 +20,6 @@ pipeline:
       output: nri-rabbitmq
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 rabbitmq-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/rabbitmq-config.yml.sample
-      install -Dm644 legacy/rabbitmq-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/rabbitmq-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/rabbitmq-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/rabbitmq-definition.yml
+          install -Dm644 legacy/rabbitmq-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/rabbitmq-definition.yml
 
 update:
   enabled: true
diff --git a/nri-redis.yaml b/nri-redis.yaml
index db52149dd32..f8474d43105 100644
--- a/nri-redis.yaml
+++ b/nri-redis.yaml
@@ -1,7 +1,7 @@
 package:
   name: nri-redis
   version: 1.11.2
-  epoch: 3
+  epoch: 4
   description: New Relic Infrastructure Redis Integration
   copyright:
     - license: Apache-2.0
@@ -20,11 +20,6 @@ pipeline:
       output: nri-redis
       ldflags: -w
 
-  - runs: |
-      mkdir -p "${{targets.destdir}}"/etc/newrelic-infra/integrations.d
-      install -Dm644 redis-config.yml.sample "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/redis-config.yml.sample
-      install -Dm644 legacy/redis-definition.yml "${{targets.destdir}}"/etc/newrelic-infra/integrations.d/redis-definition.yml
-
   - uses: strip
 
 subpackages:
@@ -34,7 +29,7 @@ subpackages:
       - runs: |
           mkdir -p ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin
           ln -sf /usr/bin/${{package.name}} ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/bin/${{package.name}}
-          ln -sf /etc/newrelic-infra/integrations.d/redis-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/redis-definition.yml
+          install -Dm644 legacy/redis-definition.yml ${{targets.subpkgdir}}/var/db/newrelic-infra/newrelic-integrations/redis-definition.yml
 
 update:
   enabled: true