properly package data files for wheels

DataDog · Jun 14, 2018 · d8abd17 · d8abd17
1 parent 9712a80
commit d8abd17
Show file tree

Hide file tree

Showing 399 changed files with 903 additions and 316 deletions.
diff --git a/active_directory/README.md b/active_directory/README.md
@@ -39,7 +39,7 @@ Need help? Contact [Datadog Support][5].
 ## Further Reading
 Learn more about infrastructure monitoring and all our integrations on [our blog][6]
 
-[1]: https://github.com/DataDog/integrations-core/blob/master/active_directory/conf.yaml.example
+[1]: https://github.com/DataDog/integrations-core/blob/master/active_directory/datadog_checks/active_directory/data/conf.yaml.example
 [2]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [3]: https://github.com/DataDog/integrations-core/blob/master/active_directory/metadata.csv
 [4]: https://app.datadoghq.com/account/settings#agent

diff --git a/active_directory/conf.yaml.example → ...s/active_directory/data/conf.yaml.example b/active_directory/conf.yaml.example → ...s/active_directory/data/conf.yaml.example
diff --git a/active_directory/manifest.in b/active_directory/manifest.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/active_directory/setup.py b/active_directory/setup.py
@@ -64,6 +64,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.active_directory': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/activemq/MANIFEST.in b/activemq/MANIFEST.in
@@ -0,0 +1,3 @@
+include README.md
+include manifest.json
+graft datadog_checks
diff --git a/activemq/README.md b/activemq/README.md
@@ -110,7 +110,7 @@ Need help? Contact [Datadog Support][107].
 [101]: https://app.datadoghq.com/account/settings#agent
 [102]: https://github.com/DataDog/jmxfetch
 [103]: http://activemq.apache.org/jmx.html
-[104]: https://github.com/DataDog/integrations-core/blob/master/activemq/conf.yaml.example
+[104]: https://github.com/DataDog/integrations-core/blob/master/activemq/datadog_checks/activemq/data/conf.yaml.example
 [105]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [107]: http://docs.datadoghq.com/help/
 [108]: https://www.datadoghq.com/blog/monitor-activemq-metrics-performance/

diff --git a/activemq/conf.yaml.example → ...og_checks/activemq/data/conf.yaml.example b/activemq/conf.yaml.example → ...og_checks/activemq/data/conf.yaml.example
diff --git a/activemq/metrics.yaml → ...datadog_checks/activemq/data/metrics.yaml b/activemq/metrics.yaml → ...datadog_checks/activemq/data/metrics.yaml
diff --git a/activemq/setup.py b/activemq/setup.py
@@ -58,6 +58,5 @@ def get_requirements(fpath):
     install_requires=['datadog_checks_base'],
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.activemq': ['conf.yaml.example', 'metrics.yaml']},
     include_package_data=True,
 )
diff --git a/activemq_xml/MANIFEST.in b/activemq_xml/MANIFEST.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/activemq_xml/README.md b/activemq_xml/README.md
@@ -43,7 +43,7 @@ Need help? Contact [Datadog Support][5].
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/activemq_xml/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [4]: https://github.com/DataDog/integrations-core/blob/master/activemq_xml/metadata.csv
 [5]: http://docs.datadoghq.com/help/

diff --git a/activemq_xml/conf.yaml.example → ...hecks/activemq_xml/data/conf.yaml.example b/activemq_xml/conf.yaml.example → ...hecks/activemq_xml/data/conf.yaml.example
diff --git a/activemq_xml/setup.py b/activemq_xml/setup.py
@@ -62,6 +62,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.activemq_xml': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/agent_metrics/MANIFEST.in b/agent_metrics/MANIFEST.in
@@ -0,0 +1,11 @@
+graft datadog_checks
+graft test
+
+include MANIFEST.in
+include README.md
+include requirements.in
+include requirements.txt
+include requirements-dev.txt
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/agent_metrics/README.md b/agent_metrics/README.md
@@ -42,7 +42,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/agent_metrics/conf.yaml.default
+[2]: https://github.com/DataDog/integrations-core/blob/master/agent_metrics/datadog_checks/agent_metrics/data/conf.yaml.default
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [4]: https://github.com/DataDog/integrations-core/blob/master/agent_metrics/metadata.csv
 [5]: http://docs.datadoghq.com/help/

diff --git a/agent_metrics/conf.yaml.default → ...ecks/agent_metrics/data/conf.yaml.default b/agent_metrics/conf.yaml.default → ...ecks/agent_metrics/data/conf.yaml.default
diff --git a/agent_metrics/setup.py b/agent_metrics/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.agent_metrics': ['conf.yaml.default']},
     include_package_data=True,
 )
diff --git a/apache/MANIFEST.in b/apache/MANIFEST.in
@@ -1,7 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
 include manifest.json
-graft datadog_checks
-graft tests
+
+global-exclude *.py[cod] __pycache__
diff --git a/apache/README.md b/apache/README.md
@@ -103,7 +103,7 @@ Returns CRITICAL if the Agent cannot connect to the configured `apache_status_ur
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/apache/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/apache/datadog_checks/apache/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [4]: https://docs.datadoghq.com/logs
 [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information

diff --git a/apache/auto_conf.yaml → ...datadog_checks/apache/data/auto_conf.yaml b/apache/auto_conf.yaml → ...datadog_checks/apache/data/auto_conf.yaml
diff --git a/apache/conf.yaml.example → ...adog_checks/apache/data/conf.yaml.example b/apache/conf.yaml.example → ...adog_checks/apache/data/conf.yaml.example
diff --git a/apache/setup.py b/apache/setup.py
@@ -72,6 +72,5 @@ def read(*parts):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={b'datadog_checks.apache': ['conf.yaml.example', 'auto_conf.yaml']},
     include_package_data=True,
 )
diff --git a/aspdotnet/README.md b/aspdotnet/README.md
@@ -43,7 +43,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog
 
 [1]: https://app.datadoghq.com/account/settings#agent
 [2]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
-[3]: https://github.com/DataDog/integrations-core/blob/master/aspdotnet/conf.yaml.example
+[3]: https://github.com/DataDog/integrations-core/blob/master/aspdotnet/datadog_checks/aspdotnet/data/conf.yaml.example
 [4]: https://app.datadoghq.com/event/stream
 [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [6]: https://www.datadoghq.com/blog/
diff --git a/aspdotnet/conf.yaml.example → ...g_checks/aspdotnet/data/conf.yaml.example b/aspdotnet/conf.yaml.example → ...g_checks/aspdotnet/data/conf.yaml.example
diff --git a/aspdotnet/manifest.in b/aspdotnet/manifest.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/aspdotnet/setup.py b/aspdotnet/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.aspdotnet': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/btrfs/MANIFEST.in b/btrfs/MANIFEST.in
@@ -1,7 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
 include manifest.json
-graft datadog_checks
-graft tests  
+
+global-exclude *.py[cod] __pycache__
diff --git a/btrfs/README.md b/btrfs/README.md
@@ -42,7 +42,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/btrfs/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/btrfs/datadog_checks/btrfs/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [5]: https://github.com/DataDog/integrations-core/blob/master/btrfs/metadata.csv

diff --git a/btrfs/conf.yaml.example → ...tadog_checks/btrfs/data/conf.yaml.example b/btrfs/conf.yaml.example → ...tadog_checks/btrfs/data/conf.yaml.example
diff --git a/btrfs/setup.py b/btrfs/setup.py
@@ -59,6 +59,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={b'datadog_checks.btrfs': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/cacti/MANIFEST.in b/cacti/MANIFEST.in
@@ -0,0 +1,11 @@
+graft datadog_checks
+graft test
+
+include MANIFEST.in
+include README.md
+include requirements.in
+include requirements.txt
+include requirements-dev.txt
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/cacti/README.md b/cacti/README.md
@@ -83,7 +83,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/cacti/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/cacti/datadog_checks/cacti/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [4]: https://github.com/DataDog/integrations-core/blob/master/cacti/metadata.csv
 [5]: http://docs.datadoghq.com/help/

diff --git a/cacti/conf.yaml.example → ...tadog_checks/cacti/data/conf.yaml.example b/cacti/conf.yaml.example → ...tadog_checks/cacti/data/conf.yaml.example
diff --git a/cacti/setup.py b/cacti/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.cacti': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/cassandra/MANIFEST.in b/cassandra/MANIFEST.in
@@ -0,0 +1,3 @@
+include README.md
+include manifest.json
+graft datadog_checks
diff --git a/cassandra/README.md b/cassandra/README.md
@@ -80,7 +80,7 @@ Need help? Contact [Datadog Support][107].
 
 [101]: https://app.datadoghq.com/account/settings#agent
 [102]: https://docs.datadoghq.com/integrations/java/
-[103]: https://github.com/DataDog/integrations-core/blob/master/cassandra/conf.yaml.example
+[103]: https://github.com/DataDog/integrations-core/blob/master/cassandra/datadog_checks/cassandra/data/conf.yaml.example
 [104]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [105]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [106]: https://github.com/DataDog/integrations-core/blob/master/cassandra/metadata.csv

diff --git a/cassandra/conf.yaml.example → ...g_checks/cassandra/data/conf.yaml.example b/cassandra/conf.yaml.example → ...g_checks/cassandra/data/conf.yaml.example
diff --git a/cassandra/metrics.yaml → ...atadog_checks/cassandra/data/metrics.yaml b/cassandra/metrics.yaml → ...atadog_checks/cassandra/data/metrics.yaml
diff --git a/cassandra/setup.py b/cassandra/setup.py
@@ -58,6 +58,5 @@ def get_requirements(fpath):
     install_requires=['datadog_checks_base'],
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.cassandra': ['conf.yaml.example', 'metrics.yaml']},
     include_package_data=True,
 )
diff --git a/cassandra_nodetool/MANIFEST.in b/cassandra_nodetool/MANIFEST.in
@@ -0,0 +1,11 @@
+graft datadog_checks
+graft test
+
+include MANIFEST.in
+include README.md
+include requirements.in
+include requirements.txt
+include requirements-dev.txt
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/cassandra_nodetool/README.md b/cassandra_nodetool/README.md
@@ -69,7 +69,7 @@ Need help? Contact [Datadog Support][6].
 
 [1]: https://github.com/DataDog/integrations-core/tree/master/cassandra
 [2]: https://app.datadoghq.com/account/settings#agent
-[3]: https://github.com/DataDog/integrations-core/blob/master/cassandra_nodetool/conf.yaml.example
+[3]: https://github.com/DataDog/integrations-core/blob/master/cassandra_nodetool/datadog_checks/cassandra_nodetool/data/conf.yaml.example
 [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [5]: https://github.com/DataDog/integrations-core/blob/master/cassandra_nodetool/metadata.csv
 [6]: http://docs.datadoghq.com/help/

diff --git a/cassandra_nodetool/conf.yaml.example → ...cassandra_nodetool/data/conf.yaml.example b/cassandra_nodetool/conf.yaml.example → ...cassandra_nodetool/data/conf.yaml.example
diff --git a/cassandra_nodetool/setup.py b/cassandra_nodetool/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.cassandra_nodetool': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/ceph/MANIFEST.in b/ceph/MANIFEST.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/ceph/README.md b/ceph/README.md
@@ -97,7 +97,7 @@ Need help? Contact [Datadog Support][5].
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/ceph/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/ceph/datadog_checks/ceph/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [4]: https://github.com/DataDog/integrations-core/blob/master/ceph/metadata.csv
 [5]: http://docs.datadoghq.com/help/

diff --git a/ceph/conf.yaml.example → ...atadog_checks/ceph/data/conf.yaml.example b/ceph/conf.yaml.example → ...atadog_checks/ceph/data/conf.yaml.example
diff --git a/ceph/setup.py b/ceph/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements("requirements-dev.txt"),
 
     # Extra files to ship with the wheel package
-    package_data={b'datadog_checks.ceph': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/cisco_aci/MANIFEST.in b/cisco_aci/MANIFEST.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/cisco_aci/README.md b/cisco_aci/README.md
@@ -62,7 +62,7 @@ Need help? Contact [Datadog Support][6].
 Learn more about infrastructure monitoring and all our integrations on [our blog][7]
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/cisco_aci/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [5]: https://github.com/DataDog/integrations-core/blob/master/cisco_aci/metadata.csv

diff --git a/cisco_aci/conf.yaml.example → ...g_checks/cisco_aci/data/conf.yaml.example b/cisco_aci/conf.yaml.example → ...g_checks/cisco_aci/data/conf.yaml.example
diff --git a/cisco_aci/setup.py b/cisco_aci/setup.py
@@ -55,6 +55,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.cisco_aci': ['conf.yaml.example']},
     include_package_data=True,
 )
diff --git a/consul/MANIFEST.in b/consul/MANIFEST.in
@@ -1,7 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
 include manifest.json
-graft datadog_checks
-graft tests
+
+global-exclude *.py[cod] __pycache__
diff --git a/consul/README.md b/consul/README.md
@@ -157,7 +157,7 @@ Need help? Contact [Datadog Support][9].
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/consul/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/consul/datadog_checks/consul/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [4]: https://docs.datadoghq.com/logs
 [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information

diff --git a/consul/auto_conf.yaml → ...datadog_checks/consul/data/auto_conf.yaml b/consul/auto_conf.yaml → ...datadog_checks/consul/data/auto_conf.yaml
diff --git a/consul/conf.yaml.example → ...adog_checks/consul/data/conf.yaml.example b/consul/conf.yaml.example → ...adog_checks/consul/data/conf.yaml.example
diff --git a/consul/setup.py b/consul/setup.py
@@ -61,6 +61,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={'datadog_checks.consul': ['conf.yaml.example', 'auto_conf.yaml']},
     include_package_data=True,
 )
diff --git a/couch/MANIFEST.in b/couch/MANIFEST.in
@@ -1,6 +1,11 @@
+graft datadog_checks
+graft tests
+
+include MANIFEST.in
 include README.md
 include requirements.in
 include requirements.txt
 include requirements-dev.txt
-graft datadog_checks
-graft tests
+include manifest.json
+
+global-exclude *.py[cod] __pycache__
diff --git a/couch/README.md b/couch/README.md
@@ -62,7 +62,7 @@ Need help? Contact [Datadog Support][6].
 
 
 [1]: https://app.datadoghq.com/account/settings#agent
-[2]: https://github.com/DataDog/integrations-core/blob/master/couch/conf.yaml.example
+[2]: https://github.com/DataDog/integrations-core/blob/master/couch/datadog_checks/couch/data/conf.yaml.example
 [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent
 [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information
 [5]: https://github.com/DataDog/integrations-core/blob/master/couch/metadata.csv

diff --git a/couch/auto_conf.yaml → .../datadog_checks/couch/data/auto_conf.yaml b/couch/auto_conf.yaml → .../datadog_checks/couch/data/auto_conf.yaml
diff --git a/couch/conf.yaml.example → ...tadog_checks/couch/data/conf.yaml.example b/couch/conf.yaml.example → ...tadog_checks/couch/data/conf.yaml.example
diff --git a/couch/setup.py b/couch/setup.py
@@ -63,6 +63,5 @@ def get_requirements(fpath):
     tests_require=get_requirements('requirements-dev.txt'),
 
     # Extra files to ship with the wheel package
-    package_data={b'datadog_checks.couch': ['conf.yaml.example', 'auto_conf.yaml']},
     include_package_data=True,
 )