diff --git a/active_directory/README.md b/active_directory/README.md index 314cdb70e58a9..c28dfd89c6941 100644 --- 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 b/active_directory/datadog_checks/active_directory/data/conf.yaml.example similarity index 100% rename from active_directory/conf.yaml.example rename to active_directory/datadog_checks/active_directory/data/conf.yaml.example diff --git a/active_directory/manifest.in b/active_directory/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- 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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/active_directory/setup.py b/active_directory/setup.py index 6ced379e0575c..dc104ae076334 100644 --- 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 new file mode 100644 index 0000000000000..608aebbe7edef --- /dev/null +++ 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 index 2e2702507e6bf..ed5b30c13e3e5 100644 --- 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 b/activemq/datadog_checks/activemq/data/conf.yaml.example similarity index 100% rename from activemq/conf.yaml.example rename to activemq/datadog_checks/activemq/data/conf.yaml.example diff --git a/activemq/metrics.yaml b/activemq/datadog_checks/activemq/data/metrics.yaml similarity index 100% rename from activemq/metrics.yaml rename to activemq/datadog_checks/activemq/data/metrics.yaml diff --git a/activemq/setup.py b/activemq/setup.py index f89a0b811d17e..807f6b8e5528c 100644 --- 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 index 03fd6943f6ea7..46f690a5c7885 100644 --- 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 index 38779d4f65acf..b510553840bb1 100644 --- 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 b/activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example similarity index 100% rename from activemq_xml/conf.yaml.example rename to activemq_xml/datadog_checks/activemq_xml/data/conf.yaml.example diff --git a/activemq_xml/setup.py b/activemq_xml/setup.py index 792cc0f143816..498548c9e757f 100644 --- 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 new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ 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 index ae714fcfcaa36..9d887515cc44d 100644 --- 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 b/agent_metrics/datadog_checks/agent_metrics/data/conf.yaml.default similarity index 100% rename from agent_metrics/conf.yaml.default rename to agent_metrics/datadog_checks/agent_metrics/data/conf.yaml.default diff --git a/agent_metrics/setup.py b/agent_metrics/setup.py index cd701ae288aee..c327265932313 100644 --- 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 index 6be195e8ce340..46f690a5c7885 100644 --- 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 index 60328c7bb32fd..af12c6e9809d7 100644 --- 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 b/apache/datadog_checks/apache/data/auto_conf.yaml similarity index 100% rename from apache/auto_conf.yaml rename to apache/datadog_checks/apache/data/auto_conf.yaml diff --git a/apache/conf.yaml.example b/apache/datadog_checks/apache/data/conf.yaml.example similarity index 100% rename from apache/conf.yaml.example rename to apache/datadog_checks/apache/data/conf.yaml.example diff --git a/apache/setup.py b/apache/setup.py index 4acf809c35394..c4cf0a45c3583 100644 --- 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 index 1c9c6bb4912bf..db77b019ad79e 100644 --- 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/ \ No newline at end of file diff --git a/aspdotnet/conf.yaml.example b/aspdotnet/datadog_checks/aspdotnet/data/conf.yaml.example similarity index 100% rename from aspdotnet/conf.yaml.example rename to aspdotnet/datadog_checks/aspdotnet/data/conf.yaml.example diff --git a/aspdotnet/manifest.in b/aspdotnet/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- 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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/aspdotnet/setup.py b/aspdotnet/setup.py index 77c8a54a8a467..e511981709240 100644 --- 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 index 25bcebd17a2ad..46f690a5c7885 100644 --- 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 \ No newline at end of file + +global-exclude *.py[cod] __pycache__ diff --git a/btrfs/README.md b/btrfs/README.md index 22aeb2df1b7d1..474a503df69df 100644 --- 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 b/btrfs/datadog_checks/btrfs/data/conf.yaml.example similarity index 100% rename from btrfs/conf.yaml.example rename to btrfs/datadog_checks/btrfs/data/conf.yaml.example diff --git a/btrfs/setup.py b/btrfs/setup.py index 89655f721dc52..63ca95cb54f6d 100644 --- 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 index 25bcebd17a2ad..46f690a5c7885 100644 --- a/cacti/MANIFEST.in +++ b/cacti/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 \ No newline at end of file + +global-exclude *.py[cod] __pycache__ diff --git a/cacti/README.md b/cacti/README.md index 2a8f84b654ea1..5f49c18f7c2c0 100644 --- 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 b/cacti/datadog_checks/cacti/data/conf.yaml.example similarity index 100% rename from cacti/conf.yaml.example rename to cacti/datadog_checks/cacti/data/conf.yaml.example diff --git a/cacti/setup.py b/cacti/setup.py index a93419990c451..6a4522bbb28af 100644 --- a/cacti/setup.py +++ b/cacti/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.cacti': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/cassandra/MANIFEST.in b/cassandra/MANIFEST.in new file mode 100644 index 0000000000000..608aebbe7edef --- /dev/null +++ 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 index 4fe8212e5609e..b8f3b5235b657 100644 --- 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 b/cassandra/datadog_checks/cassandra/data/conf.yaml.example similarity index 100% rename from cassandra/conf.yaml.example rename to cassandra/datadog_checks/cassandra/data/conf.yaml.example diff --git a/cassandra/metrics.yaml b/cassandra/datadog_checks/cassandra/data/metrics.yaml similarity index 100% rename from cassandra/metrics.yaml rename to cassandra/datadog_checks/cassandra/data/metrics.yaml diff --git a/cassandra/setup.py b/cassandra/setup.py index e0586a3917df2..541a286f91488 100644 --- 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 new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ 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 index b3ba8526b0b18..aca6fd9507e11 100644 --- 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 b/cassandra_nodetool/datadog_checks/cassandra_nodetool/data/conf.yaml.example similarity index 100% rename from cassandra_nodetool/conf.yaml.example rename to cassandra_nodetool/datadog_checks/cassandra_nodetool/data/conf.yaml.example diff --git a/cassandra_nodetool/setup.py b/cassandra_nodetool/setup.py index c1f1d439dccff..8e292d67ee13c 100644 --- 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 index 8cff9b2a012f7..46f690a5c7885 100644 --- 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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/ceph/README.md b/ceph/README.md index b2c23501813a1..7d9da22941c0a 100644 --- 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 b/ceph/datadog_checks/ceph/data/conf.yaml.example similarity index 100% rename from ceph/conf.yaml.example rename to ceph/datadog_checks/ceph/data/conf.yaml.example diff --git a/ceph/setup.py b/ceph/setup.py index 2e342ae8c0d4d..ee5df8672834e 100644 --- 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 index 03fd6943f6ea7..46f690a5c7885 100644 --- 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 index 05443b8aa5779..661f5901052c4 100644 --- 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 b/cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example similarity index 100% rename from cisco_aci/conf.yaml.example rename to cisco_aci/datadog_checks/cisco_aci/data/conf.yaml.example diff --git a/cisco_aci/setup.py b/cisco_aci/setup.py index 007dc5cb239a6..9035c319a8c3a 100644 --- 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 index 6be195e8ce340..46f690a5c7885 100644 --- 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 index ae12e079c1830..a404ffdddeaed 100644 --- 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 b/consul/datadog_checks/consul/data/auto_conf.yaml similarity index 100% rename from consul/auto_conf.yaml rename to consul/datadog_checks/consul/data/auto_conf.yaml diff --git a/consul/conf.yaml.example b/consul/datadog_checks/consul/data/conf.yaml.example similarity index 100% rename from consul/conf.yaml.example rename to consul/datadog_checks/consul/data/conf.yaml.example diff --git a/consul/setup.py b/consul/setup.py index 7059468238cb8..94fd52fc3ed10 100644 --- 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 index 03fd6943f6ea7..46f690a5c7885 100644 --- 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 index 8325ac2bcfb9d..10c3b33e9602e 100644 --- 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 b/couch/datadog_checks/couch/data/auto_conf.yaml similarity index 100% rename from couch/auto_conf.yaml rename to couch/datadog_checks/couch/data/auto_conf.yaml diff --git a/couch/conf.yaml.example b/couch/datadog_checks/couch/data/conf.yaml.example similarity index 100% rename from couch/conf.yaml.example rename to couch/datadog_checks/couch/data/conf.yaml.example diff --git a/couch/setup.py b/couch/setup.py index dc295c018faa9..dbd4ec5687b2f 100644 --- 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, ) diff --git a/couchbase/MANIFEST.in b/couchbase/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/couchbase/MANIFEST.in +++ b/couchbase/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/couchbase/README.md b/couchbase/README.md index 0ab622efd1b8a..3892fc666c952 100644 --- a/couchbase/README.md +++ b/couchbase/README.md @@ -23,7 +23,7 @@ The Couchbase check is included in the [Datadog Agent](https://app.datadoghq.com ### Configuration 1. Edit the `couchbase.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory to start collecting your Couchbase performance data. - See the [sample couchbase.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/couchbase/conf.yaml.example) for all available configuration options. + See the [sample couchbase.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/couchbase/datadog_checks/couchbase/data/conf.yaml.example) for all available configuration options. ``` init_config: diff --git a/couchbase/auto_conf.yaml b/couchbase/datadog_checks/couchbase/data/auto_conf.yaml similarity index 100% rename from couchbase/auto_conf.yaml rename to couchbase/datadog_checks/couchbase/data/auto_conf.yaml diff --git a/couchbase/conf.yaml.example b/couchbase/datadog_checks/couchbase/data/conf.yaml.example similarity index 100% rename from couchbase/conf.yaml.example rename to couchbase/datadog_checks/couchbase/data/conf.yaml.example diff --git a/couchbase/setup.py b/couchbase/setup.py index d1843b843dba0..91473b4e0a0d4 100644 --- a/couchbase/setup.py +++ b/couchbase/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.couchbase': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/directory/MANIFEST.in b/directory/MANIFEST.in index 62f5a503e4e6a..46f690a5c7885 100644 --- a/directory/MANIFEST.in +++ b/directory/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 \ No newline at end of file + +global-exclude *.py[cod] __pycache__ diff --git a/directory/README.md b/directory/README.md index e99fef920deb7..9fd42146ce8c3 100644 --- a/directory/README.md +++ b/directory/README.md @@ -57,7 +57,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/directory/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/directory/datadog_checks/directory/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/directory/metadata.csv diff --git a/directory/conf.yaml.example b/directory/datadog_checks/directory/data/conf.yaml.example similarity index 100% rename from directory/conf.yaml.example rename to directory/datadog_checks/directory/data/conf.yaml.example diff --git a/directory/setup.py b/directory/setup.py index c0fcd12263ee6..3b9b298232cb2 100644 --- a/directory/setup.py +++ b/directory/setup.py @@ -66,6 +66,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.directory': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/disk/MANIFEST.in b/disk/MANIFEST.in index 4a85790652b39..46f690a5c7885 100644 --- a/disk/MANIFEST.in +++ b/disk/MANIFEST.in @@ -1,6 +1,11 @@ +graft datadog_checks +graft tests + +include MANIFEST.in include README.md include requirements.in include requirements.txt -include tests/requirements.txt -graft datadog_checks -graft tests +include requirements-dev.txt +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/disk/README.md b/disk/README.md index a0115e8f32656..abcb2577b35be 100644 --- a/disk/README.md +++ b/disk/README.md @@ -37,7 +37,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/disk/conf.yaml.default +[2]: https://github.com/DataDog/integrations-core/blob/master/disk/datadog_checks/disk/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/disk/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/disk/conf.yaml.default b/disk/datadog_checks/disk/data/conf.yaml.default similarity index 100% rename from disk/conf.yaml.default rename to disk/datadog_checks/disk/data/conf.yaml.default diff --git a/disk/setup.py b/disk/setup.py index 1faae2f235ba9..8f8f77fb4e03b 100644 --- a/disk/setup.py +++ b/disk/setup.py @@ -72,6 +72,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.disk': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/dns_check/MANIFEST.in b/dns_check/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/dns_check/MANIFEST.in +++ b/dns_check/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/dns_check/README.md b/dns_check/README.md index 32d0670f2b581..94b107b8d90ac 100644 --- a/dns_check/README.md +++ b/dns_check/README.md @@ -66,7 +66,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/dns_check/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/dns_check/datadog_checks/dns_check/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/dns_check/metadata.csv diff --git a/dns_check/conf.yaml.example b/dns_check/datadog_checks/dns_check/data/conf.yaml.example similarity index 100% rename from dns_check/conf.yaml.example rename to dns_check/datadog_checks/dns_check/data/conf.yaml.example diff --git a/dns_check/setup.py b/dns_check/setup.py index 6dd846731473b..de46beb4887ce 100644 --- a/dns_check/setup.py +++ b/dns_check/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={b'datadog_checks.dns_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/docker_daemon/MANIFEST.in b/docker_daemon/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/docker_daemon/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/docker_daemon/README.md b/docker_daemon/README.md index 569fb880ac8cc..fbcb13643f990 100644 --- a/docker_daemon/README.md +++ b/docker_daemon/README.md @@ -180,7 +180,7 @@ We've also written several other in-depth blog posts to help you get the most ou [2]: https://github.com/DataDog/docker-dd-agent#cgroups [3]: https://app.datadoghq.com/account/settings#agent [4]: https://app.datadoghq.com/account/settings#integrations/docker -[5]: https://github.com/DataDog/integrations-core/blob/master/docker_daemon/conf.yaml.example +[5]: https://github.com/DataDog/integrations-core/blob/master/docker_daemon/datadog_checks/docker_daemon/data/conf.yaml.example [6]: https://app.datadoghq.com/account/settings#agent/docker [7]: https://github.com/DataDog/dd-agent/wiki/Proxy-Configuration#using-the-agent-as-a-proxy [8]: https://github.com/DataDog/dd-agent/wiki/Capturing-EC2-tags-at-startup diff --git a/docker_daemon/conf.yaml.example b/docker_daemon/datadog_checks/docker_daemon/data/conf.yaml.example similarity index 100% rename from docker_daemon/conf.yaml.example rename to docker_daemon/datadog_checks/docker_daemon/data/conf.yaml.example diff --git a/docker_daemon/setup.py b/docker_daemon/setup.py index 9c2c2381bbb36..21ab8f685c580 100644 --- a/docker_daemon/setup.py +++ b/docker_daemon/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.docker_daemon': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/dotnetclr/conf.yaml.example b/dotnetclr/datadog_checks/dotnetclr/data/conf.yaml.example similarity index 100% rename from dotnetclr/conf.yaml.example rename to dotnetclr/datadog_checks/dotnetclr/data/conf.yaml.example diff --git a/dotnetclr/manifest.in b/dotnetclr/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/dotnetclr/manifest.in +++ b/dotnetclr/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/dotnetclr/setup.py b/dotnetclr/setup.py index 4c680d088f866..33c8e4d131dc1 100644 --- a/dotnetclr/setup.py +++ b/dotnetclr/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.dotnetclr': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/ecs_fargate/MANIFEST.in b/ecs_fargate/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/ecs_fargate/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/ecs_fargate/README.md b/ecs_fargate/README.md index 5b098e0d21585..c2c96f8cad050 100644 --- a/ecs_fargate/README.md +++ b/ecs_fargate/README.md @@ -51,4 +51,4 @@ Need help? Contact [Datadog Support][3]. [3]: http://docs.datadoghq.com/help/ [4]: https://www.datadoghq.com/blog/monitor-aws-fargate/ [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent -[6]: https://github.com/DataDog/integrations-core/blob/master/ecs_fargate/conf.yaml.example +[6]: https://github.com/DataDog/integrations-core/blob/master/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example diff --git a/ecs_fargate/conf.yaml.example b/ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example similarity index 100% rename from ecs_fargate/conf.yaml.example rename to ecs_fargate/datadog_checks/ecs_fargate/data/conf.yaml.example diff --git a/ecs_fargate/setup.py b/ecs_fargate/setup.py index 77e8c22c89d69..8aa7d7af69df0 100644 --- a/ecs_fargate/setup.py +++ b/ecs_fargate/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.ecs_fargate': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/elastic/MANIFEST.in b/elastic/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/elastic/MANIFEST.in +++ b/elastic/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/elastic/auto_conf.yaml b/elastic/datadog_checks/elastic/data/auto_conf.yaml similarity index 100% rename from elastic/auto_conf.yaml rename to elastic/datadog_checks/elastic/data/auto_conf.yaml diff --git a/elastic/conf.yaml.example b/elastic/datadog_checks/elastic/data/conf.yaml.example similarity index 100% rename from elastic/conf.yaml.example rename to elastic/datadog_checks/elastic/data/conf.yaml.example diff --git a/elastic/setup.py b/elastic/setup.py index 06a4d45b1d2cd..e54aca906b4eb 100644 --- a/elastic/setup.py +++ b/elastic/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={b'datadog_checks.elastic': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/envoy/MANIFEST.in b/envoy/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/envoy/MANIFEST.in +++ b/envoy/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/envoy/README.md b/envoy/README.md index a260bf10dcb51..dc45db347653b 100644 --- a/envoy/README.md +++ b/envoy/README.md @@ -123,7 +123,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [1]: https://www.envoyproxy.io [2]: https://app.datadoghq.com/account/settings#agent [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent -[4]: https://github.com/DataDog/integrations-core/blob/master/envoy/conf.yaml.example +[4]: https://github.com/DataDog/integrations-core/blob/master/envoy/datadog_checks/envoy/data/conf.yaml.example [5]: https://www.envoyproxy.io/docs/envoy/latest/operations/admin [6]: https://istio.io [7]: https://istio.io/docs/reference/config/ diff --git a/envoy/conf.yaml.example b/envoy/datadog_checks/envoy/data/conf.yaml.example similarity index 100% rename from envoy/conf.yaml.example rename to envoy/datadog_checks/envoy/data/conf.yaml.example diff --git a/envoy/setup.py b/envoy/setup.py index 290cbd4e98db7..d4e44621bd605 100644 --- a/envoy/setup.py +++ b/envoy/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.envoy': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/etcd/MANIFEST.in b/etcd/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/etcd/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/etcd/README.md b/etcd/README.md index fba236f32d32b..1f500eb06d3ff 100644 --- a/etcd/README.md +++ b/etcd/README.md @@ -59,7 +59,7 @@ To get a better idea of how (or why) to integrate etcd with Datadog, check out o [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/etcd/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/etcd/datadog_checks/etcd/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/etcd/metadata.csv diff --git a/etcd/auto_conf.yaml b/etcd/datadog_checks/etcd/data/auto_conf.yaml similarity index 100% rename from etcd/auto_conf.yaml rename to etcd/datadog_checks/etcd/data/auto_conf.yaml diff --git a/etcd/conf.yaml.example b/etcd/datadog_checks/etcd/data/conf.yaml.example similarity index 100% rename from etcd/conf.yaml.example rename to etcd/datadog_checks/etcd/data/conf.yaml.example diff --git a/etcd/setup.py b/etcd/setup.py index e4c62222dca22..5fae7d54fc264 100644 --- a/etcd/setup.py +++ b/etcd/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.etcd': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/exchange_server/README.md b/exchange_server/README.md index aeb40c7d3c78e..ab1348f42016c 100644 --- a/exchange_server/README.md +++ b/exchange_server/README.md @@ -34,7 +34,7 @@ The Exchange server check does not include any service checks at this time. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/exchange_server/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/exchange_server/datadog_checks/exchange_server/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/exchange_server/metadata.csv [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent diff --git a/exchange_server/conf.yaml.example b/exchange_server/datadog_checks/exchange_server/data/conf.yaml.example similarity index 100% rename from exchange_server/conf.yaml.example rename to exchange_server/datadog_checks/exchange_server/data/conf.yaml.example diff --git a/exchange_server/manifest.in b/exchange_server/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/exchange_server/manifest.in +++ b/exchange_server/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/exchange_server/setup.py b/exchange_server/setup.py index 74084a2363105..8a6d4c783fcd2 100644 --- a/exchange_server/setup.py +++ b/exchange_server/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.exchange_server': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/fluentd/MANIFEST.in b/fluentd/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/fluentd/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/fluentd/README.md b/fluentd/README.md index db437a0f7f5b7..efb89aba1e80f 100644 --- a/fluentd/README.md +++ b/fluentd/README.md @@ -79,7 +79,7 @@ Need help? Contact [Datadog Support][7]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/fluentd/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/fluentd/datadog_checks/fluentd/data/conf.yaml.example [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [4]: https://docs.datadoghq.com/logs/log_collection/fluentd/ [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/fluentd/conf.yaml.example b/fluentd/datadog_checks/fluentd/data/conf.yaml.example similarity index 100% rename from fluentd/conf.yaml.example rename to fluentd/datadog_checks/fluentd/data/conf.yaml.example diff --git a/fluentd/setup.py b/fluentd/setup.py index af182745e5bac..f37ff7d604ff1 100644 --- a/fluentd/setup.py +++ b/fluentd/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.fluentd': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/gearmand/MANIFEST.in b/gearmand/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/gearmand/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/gearmand/README.md b/gearmand/README.md index 3c80a5f6da89c..53d08359a48b9 100644 --- a/gearmand/README.md +++ b/gearmand/README.md @@ -54,7 +54,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/gearmand/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/gearmand/datadog_checks/gearmand/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/gearmand/metadata.csv diff --git a/gearmand/conf.yaml.example b/gearmand/datadog_checks/gearmand/data/conf.yaml.example similarity index 100% rename from gearmand/conf.yaml.example rename to gearmand/datadog_checks/gearmand/data/conf.yaml.example diff --git a/gearmand/setup.py b/gearmand/setup.py index 5f75a95cbb5df..31bf7365713e8 100644 --- a/gearmand/setup.py +++ b/gearmand/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.gearmand': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/gitlab/MANIFEST.in b/gitlab/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/gitlab/MANIFEST.in +++ b/gitlab/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/gitlab/README.md b/gitlab/README.md index 8d249de0f2e51..69ee3313e99fb 100644 --- a/gitlab/README.md +++ b/gitlab/README.md @@ -44,7 +44,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [101]: https://app.datadoghq.com/account/settings#agent -[102]: https://github.com/DataDog/integrations-core/blob/master/gitlab/conf.yaml.example +[102]: https://github.com/DataDog/integrations-core/blob/master/gitlab/datadog_checks/gitlab/data/conf.yaml.example [103]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [104]: https://github.com/DataDog/integrations-core/blob/master/gitlab/metadata.csv [105]: http://docs.datadoghq.com/help/ diff --git a/gitlab/conf.yaml.example b/gitlab/datadog_checks/gitlab/data/conf.yaml.example similarity index 100% rename from gitlab/conf.yaml.example rename to gitlab/datadog_checks/gitlab/data/conf.yaml.example diff --git a/gitlab/setup.py b/gitlab/setup.py index 59d44e1e37220..26c59fc73a242 100644 --- a/gitlab/setup.py +++ b/gitlab/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.gitlab': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/gitlab_runner/MANIFEST.in b/gitlab_runner/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/gitlab_runner/MANIFEST.in +++ b/gitlab_runner/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/gitlab_runner/README.md b/gitlab_runner/README.md index befea923a101e..c6eb4f1ceb333 100644 --- a/gitlab_runner/README.md +++ b/gitlab_runner/README.md @@ -47,7 +47,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/gitlab_runner/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/gitlab_runner/datadog_checks/gitlab_runner/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/gitlab_runner/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/gitlab_runner/conf.yaml.example b/gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example similarity index 100% rename from gitlab_runner/conf.yaml.example rename to gitlab_runner/datadog_checks/gitlab_runner/data/conf.yaml.example diff --git a/gitlab_runner/setup.py b/gitlab_runner/setup.py index 3abe0233246e6..aac1c763eadb7 100644 --- a/gitlab_runner/setup.py +++ b/gitlab_runner/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.gitlab_runner': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/gitlab_runner/tests/compose/docker-compose.yml b/gitlab_runner/tests/compose/docker-compose.yml index 3204393eff864..74ccc97b1258f 100644 --- a/gitlab_runner/tests/compose/docker-compose.yml +++ b/gitlab_runner/tests/compose/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: gitlab_runner: - image: gitlab/gitlab-runner:latest + image: gitlab/gitlab-runner:v10.8.0 depends_on: - gitlab volumes: diff --git a/go_expvar/MANIFEST.in b/go_expvar/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/go_expvar/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/go_expvar/README.md b/go_expvar/README.md index 33bbc30f0ac81..d08f80e3d5b04 100644 --- a/go_expvar/README.md +++ b/go_expvar/README.md @@ -71,7 +71,7 @@ Need help? Contact [Datadog Support][9]. [2]: https://app.datadoghq.com/account/settings#agent [3]: https://golang.org/pkg/expvar/ [4]: https://golang.org/pkg/net/http/#ListenAndServe -[5]: https://github.com/DataDog/integrations-core/blob/master/go_expvar/conf.yaml.example +[5]: https://github.com/DataDog/integrations-core/blob/master/go_expvar/datadog_checks/go_expvar/data/conf.yaml.example [6]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [7]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [8]: https://github.com/DataDog/integrations-core/blob/master/go_expvar/metadata.csv diff --git a/go_expvar/conf.yaml.example b/go_expvar/datadog_checks/go_expvar/data/conf.yaml.example similarity index 100% rename from go_expvar/conf.yaml.example rename to go_expvar/datadog_checks/go_expvar/data/conf.yaml.example diff --git a/go_expvar/setup.py b/go_expvar/setup.py index 5927d7a5cb971..0653890096992 100644 --- a/go_expvar/setup.py +++ b/go_expvar/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.go_expvar': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/gunicorn/MANIFEST.in b/gunicorn/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/gunicorn/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/gunicorn/README.md b/gunicorn/README.md index 3ca0b37929c09..9a70dc8fa3e86 100644 --- a/gunicorn/README.md +++ b/gunicorn/README.md @@ -153,7 +153,7 @@ To get a better idea of how (or why) to integrate your Gunicorn apps with Datado [1]: https://app.datadoghq.com/account/settings#agent [2]: https://pypi.python.org/pypi/setproctitle -[3]: https://github.com/DataDog/integrations-core/blob/master/gunicorn/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/gunicorn/datadog_checks/gunicorn/data/conf.yaml.example [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [5]: http://docs.gunicorn.org/en/stable/settings.html#statsd-host [6]: https://docs.datadoghq.com/guides/dogstatsd diff --git a/gunicorn/conf.yaml.example b/gunicorn/datadog_checks/gunicorn/data/conf.yaml.example similarity index 100% rename from gunicorn/conf.yaml.example rename to gunicorn/datadog_checks/gunicorn/data/conf.yaml.example diff --git a/gunicorn/setup.py b/gunicorn/setup.py index 1cbe7567a00bf..43a9592658e21 100644 --- a/gunicorn/setup.py +++ b/gunicorn/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.gunicorn': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/haproxy/MANIFEST.in b/haproxy/MANIFEST.in index 6be195e8ce340..46f690a5c7885 100644 --- a/haproxy/MANIFEST.in +++ b/haproxy/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/haproxy/README.md b/haproxy/README.md index b5dfb3e6d8e09..82b574558a7b0 100644 --- a/haproxy/README.md +++ b/haproxy/README.md @@ -22,7 +22,7 @@ The HAProxy check is packaged with the Agent. To start gathering your HAProxy me ### Configuration Edit the `haproxy.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory to start collecting your HAProxy [metrics](#metric-collection) and [logs](#log-collection). -See the [sample haproxy.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/conf.yaml.example) for all available configuration options. +See the [sample haproxy.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/datadog_checks/haproxy/data/conf.yaml.example) for all available configuration options. #### Prepare HAProxy @@ -56,7 +56,7 @@ Add this configuration block to your `haproxy.d/conf.yaml` file to start gatheri password: ``` - See the [sample haproxy.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/conf.yaml.example) for all available configuration options. + See the [sample haproxy.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/datadog_checks/haproxy/data/conf.yaml.example) for all available configuration options. * [Restart the Agent](https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent). @@ -81,7 +81,7 @@ Add this configuration block to your `haproxy.d/conf.yaml` file to start gatheri sourcecategory: http_web_access ``` - Change the `service` parameter value and configure it for your environment. See the [sample haproxy.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/conf.yaml.example) for all available configuration options. + Change the `service` parameter value and configure it for your environment. See the [sample haproxy.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/haproxy/datadog_checks/haproxy/data/conf.yaml.example) for all available configuration options. * [Restart the Agent](https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent) @@ -118,7 +118,7 @@ Need help? Contact [Datadog Support](http://docs.datadoghq.com/help/). [1]: https://app.datadoghq.com/account/settings#agent [2]: https://www.datadoghq.com/blog/how-to-collect-haproxy-metrics/ [3]: https://www.haproxy.org/download/1.7/doc/management.txt -[4]: https://github.com/DataDog/integrations-core/blob/master/haproxy/conf.yaml.example +[4]: https://github.com/DataDog/integrations-core/blob/master/haproxy/datadog_checks/haproxy/data/conf.yaml.example [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [6]: https://docs.datadoghq.com/logs [7]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/haproxy/conf.yaml.example b/haproxy/datadog_checks/haproxy/data/conf.yaml.example similarity index 100% rename from haproxy/conf.yaml.example rename to haproxy/datadog_checks/haproxy/data/conf.yaml.example diff --git a/haproxy/setup.py b/haproxy/setup.py index f08f41be77406..4264c12f347bc 100644 --- a/haproxy/setup.py +++ b/haproxy/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={b'datadog_checks.haproxy': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/hdfs_datanode/MANIFEST.in b/hdfs_datanode/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/hdfs_datanode/MANIFEST.in +++ b/hdfs_datanode/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/hdfs_datanode/README.md b/hdfs_datanode/README.md index 6fce0ced69cfe..86fbfd66859af 100644 --- a/hdfs_datanode/README.md +++ b/hdfs_datanode/README.md @@ -67,7 +67,7 @@ Need help? Contact [Datadog Support][106]. [101]: https://app.datadoghq.com/account/settings#agent -[102]: https://github.com/DataDog/integrations-core/blob/master/hdfs_datanode/conf.yaml.example +[102]: https://github.com/DataDog/integrations-core/blob/master/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example [103]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [104]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [105]: https://github.com/DataDog/integrations-core/blob/master/hdfs_datanode/metadata.csv diff --git a/hdfs_datanode/conf.yaml.example b/hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example similarity index 100% rename from hdfs_datanode/conf.yaml.example rename to hdfs_datanode/datadog_checks/hdfs_datanode/data/conf.yaml.example diff --git a/hdfs_datanode/setup.py b/hdfs_datanode/setup.py index 4112110f48c50..63efbe87b9495 100644 --- a/hdfs_datanode/setup.py +++ b/hdfs_datanode/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.hdfs_datanode': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/hdfs_namenode/MANIFEST.in b/hdfs_namenode/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/hdfs_namenode/MANIFEST.in +++ b/hdfs_namenode/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/hdfs_namenode/README.md b/hdfs_namenode/README.md index 1479bdd74c304..9d42761fb631f 100644 --- a/hdfs_namenode/README.md +++ b/hdfs_namenode/README.md @@ -68,7 +68,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/hdfs_namenode/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/hdfs_namenode/datadog_checks/hdfs_namenode/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/hdfs_namenode/metadata.csv diff --git a/hdfs_namenode/conf.yaml.example b/hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example similarity index 100% rename from hdfs_namenode/conf.yaml.example rename to hdfs_namenode/datadog_checks/hdfs_namenode/data/conf.yaml.example diff --git a/hdfs_namenode/setup.py b/hdfs_namenode/setup.py index e72e6d680c16b..81d7a918ceaba 100644 --- a/hdfs_namenode/setup.py +++ b/hdfs_namenode/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.hdfs_namenode': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/http_check/MANIFEST.in b/http_check/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/http_check/MANIFEST.in +++ b/http_check/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/http_check/README.md b/http_check/README.md index 81c36e1a5c5d9..ac739543e496c 100644 --- a/http_check/README.md +++ b/http_check/README.md @@ -54,7 +54,7 @@ See the [sample http_check.d/conf.yaml][2] for a full list and description of av | `days_warning` & `days_critical` | When `check_certificate_expiration` is enabled, these settings will raise a warning or critical alert when the SSL certificate is within the specified number of days from expiration. | | `check_hostname` | When `check_certificate_expiration` is enabled, this setting will raise a warning if the hostname on the SSL certificate does not match the host of the given URL. | | `ssl_server_name` | When `check_certificate_expiration` is enabled, this setting specifies the hostname of the service to connect to and it also overrides the host to match with if check_hostname is enabled. | -| `headers` | This parameter allows you to send additional headers with the request. Please see the [example YAML file](https://github.com/DataDog/integrations-core/blob/master/http_check/conf.yaml.example) for additional information and caveats. | +| `headers` | This parameter allows you to send additional headers with the request. Please see the [example YAML file](https://github.com/DataDog/integrations-core/blob/master/http_check/datadog_checks/http_check/data/conf.yaml.example) for additional information and caveats. | | `skip_proxy` | If set, the check will bypass proxy settings and attempt to reach the check url directly. This defaults to `false`. | | `allow_redirects` | This setting allows the service check to follow HTTP redirects and defaults to `true`. | `tags` | A list of arbitrary tags that will be associated with the check. For more information about tags, please see our [Guide to tagging][3] and blog post, [The power of tagged metrics][4] | @@ -112,7 +112,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/http_check/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/http_check/datadog_checks/http_check/data/conf.yaml.example [3]: https://docs.datadoghq.com/getting_started/tagging/ [4]: https://www.datadoghq.com/blog/the-power-of-tagged-metrics/ [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent diff --git a/http_check/conf.yaml.example b/http_check/datadog_checks/http_check/data/conf.yaml.example similarity index 100% rename from http_check/conf.yaml.example rename to http_check/datadog_checks/http_check/data/conf.yaml.example diff --git a/http_check/setup.py b/http_check/setup.py index 127e6b5e86c85..d38af508ab255 100644 --- a/http_check/setup.py +++ b/http_check/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.http_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/iis/README.md b/iis/README.md index aa0a5e6655bb9..7f5f1d7c80d67 100644 --- a/iis/README.md +++ b/iis/README.md @@ -158,7 +158,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/basic_agent_usage/windows/#agent-check-directory-structure -[3]: https://github.com/DataDog/integrations-core/blob/master/iis/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/iis/datadog_checks/iis/data/conf.yaml.example [4]: https://msdn.microsoft.com/en-us/library/aa393067.aspx [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [6]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/iis/conf.yaml.example b/iis/datadog_checks/iis/data/conf.yaml.example similarity index 100% rename from iis/conf.yaml.example rename to iis/datadog_checks/iis/data/conf.yaml.example diff --git a/iis/manifest.in b/iis/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/iis/manifest.in +++ b/iis/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/iis/setup.py b/iis/setup.py index fcf6c70f141ff..cbe210fb45ad4 100644 --- a/iis/setup.py +++ b/iis/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.iis': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/istio/MANIFEST.in b/istio/MANIFEST.in index 4a85790652b39..46f690a5c7885 100644 --- a/istio/MANIFEST.in +++ b/istio/MANIFEST.in @@ -1,6 +1,11 @@ +graft datadog_checks +graft tests + +include MANIFEST.in include README.md include requirements.in include requirements.txt -include tests/requirements.txt -graft datadog_checks -graft tests +include requirements-dev.txt +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/istio/README.md b/istio/README.md index 8697212df6998..7b3db32b969e5 100644 --- a/istio/README.md +++ b/istio/README.md @@ -22,7 +22,7 @@ Istio needs to have the built in [prometheus adapter](https://istio.io/docs/task #### Connect the Agent -Edit the `istio.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory, to connect it to Istio. See the [sample istio.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/istio/conf.yaml.example) for all available configuration options: +Edit the `istio.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory, to connect it to Istio. See the [sample istio.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/istio/datadog_checks/istio/data/conf.yaml.example) for all available configuration options: ``` init_config: diff --git a/istio/conf.yaml.example b/istio/datadog_checks/istio/data/conf.yaml.example similarity index 100% rename from istio/conf.yaml.example rename to istio/datadog_checks/istio/data/conf.yaml.example diff --git a/istio/setup.py b/istio/setup.py index 1ac7cc28a735a..5eff48ea490dc 100644 --- a/istio/setup.py +++ b/istio/setup.py @@ -63,6 +63,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.istio': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/kafka/MANIFEST.in b/kafka/MANIFEST.in new file mode 100644 index 0000000000000..608aebbe7edef --- /dev/null +++ b/kafka/MANIFEST.in @@ -0,0 +1,3 @@ +include README.md +include manifest.json +graft datadog_checks diff --git a/kafka/README.md b/kafka/README.md index 1f48007826203..c5ab29760d1f1 100644 --- a/kafka/README.md +++ b/kafka/README.md @@ -117,7 +117,7 @@ Returns `OK` otherwise. [15]: https://app.datadoghq.com/account/settings#agent [16]: https://github.com/DataDog/jmxfetch [17]: https://github.com/DataDog/dd-agent/wiki/Deprecated-instructions-to-install-python-dependencies-for-the-Datadog-Agent -[18]: https://github.com/DataDog/integrations-core/blob/master/kafka/conf.yaml.example +[18]: https://github.com/DataDog/integrations-core/blob/master/kafka/datadog_checks/kafka/data/conf.yaml.example [19]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [20]: https://docs.datadoghq.com/logs/processing/#integration-pipelines [21]: https://docs.datadoghq.com/logs diff --git a/kafka/conf.yaml.example b/kafka/datadog_checks/kafka/data/conf.yaml.example similarity index 100% rename from kafka/conf.yaml.example rename to kafka/datadog_checks/kafka/data/conf.yaml.example diff --git a/kafka/metrics.yaml b/kafka/datadog_checks/kafka/data/metrics.yaml similarity index 100% rename from kafka/metrics.yaml rename to kafka/datadog_checks/kafka/data/metrics.yaml diff --git a/kafka/setup.py b/kafka/setup.py index 86b24bce38bd4..7f05093f36509 100644 --- a/kafka/setup.py +++ b/kafka/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.kafka': ['conf.yaml.example', 'metrics.yaml']}, include_package_data=True, ) diff --git a/kafka_consumer/MANIFEST.in b/kafka_consumer/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/kafka_consumer/MANIFEST.in +++ b/kafka_consumer/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/kafka_consumer/README.md b/kafka_consumer/README.md index cd99d7d94bbf0..e69f3ae59921f 100644 --- a/kafka_consumer/README.md +++ b/kafka_consumer/README.md @@ -47,7 +47,7 @@ The Kafka-consumer check does not include any service checks at this time. [101]: https://app.datadoghq.com/account/settings#agent -[102]: https://github.com/DataDog/integrations-core/blob/master/kafka_consumer/conf.yaml.example +[102]: https://github.com/DataDog/integrations-core/blob/master/kafka_consumer/datadog_checks/kafka_consumer/data/conf.yaml.example [103]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [104]: https://github.com/DataDog/integrations-core/blob/master/kafka_consumer/metadata.csv [105]: https://www.datadoghq.com/blog/monitoring-kafka-performance-metrics/ diff --git a/kafka_consumer/conf.yaml.example b/kafka_consumer/datadog_checks/kafka_consumer/data/conf.yaml.example similarity index 100% rename from kafka_consumer/conf.yaml.example rename to kafka_consumer/datadog_checks/kafka_consumer/data/conf.yaml.example diff --git a/kafka_consumer/setup.py b/kafka_consumer/setup.py index c3d1b0daeef43..0eda599fef761 100644 --- a/kafka_consumer/setup.py +++ b/kafka_consumer/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={b'datadog_checks.kafka_consumer': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/kong/MANIFEST.in b/kong/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/kong/MANIFEST.in +++ b/kong/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/kong/README.md b/kong/README.md index 5f24733196d07..88ca910d6b611 100644 --- a/kong/README.md +++ b/kong/README.md @@ -55,7 +55,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/kong/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/kong/datadog_checks/kong/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/kong/metadata.csv diff --git a/kong/conf.yaml.example b/kong/datadog_checks/kong/data/conf.yaml.example similarity index 100% rename from kong/conf.yaml.example rename to kong/datadog_checks/kong/data/conf.yaml.example diff --git a/kong/setup.py b/kong/setup.py index 9e084d5006818..89858320fac10 100644 --- a/kong/setup.py +++ b/kong/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.kong': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/kube_dns/MANIFEST.in b/kube_dns/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/kube_dns/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/kube_dns/README.md b/kube_dns/README.md index 7c822f5e56401..5f15869db6e79 100644 --- a/kube_dns/README.md +++ b/kube_dns/README.md @@ -65,7 +65,7 @@ Need help? Contact [Datadog Support][5]. Learn more about infrastructure monitoring and all our integrations on [our blog][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/kube_dns/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/kube_dns/datadog_checks/kube_dns/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/kube_dns/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/kube_dns/auto_conf.yaml b/kube_dns/datadog_checks/kube_dns/data/auto_conf.yaml similarity index 100% rename from kube_dns/auto_conf.yaml rename to kube_dns/datadog_checks/kube_dns/data/auto_conf.yaml diff --git a/kube_dns/conf.yaml.example b/kube_dns/datadog_checks/kube_dns/data/conf.yaml.example similarity index 100% rename from kube_dns/conf.yaml.example rename to kube_dns/datadog_checks/kube_dns/data/conf.yaml.example diff --git a/kube_dns/setup.py b/kube_dns/setup.py index dc3b8c463f282..4a95a1be6de97 100644 --- a/kube_dns/setup.py +++ b/kube_dns/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.kube_dns': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/kube_proxy/MANIFEST.in b/kube_proxy/MANIFEST.in index a4add07593504..46f690a5c7885 100644 --- a/kube_proxy/MANIFEST.in +++ b/kube_proxy/MANIFEST.in @@ -1,6 +1,11 @@ -include requirements.in -include requirements.txt -include tests/requirements.txt -include README.md graft datadog_checks graft tests + +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/kube_proxy/auto_conf.yaml b/kube_proxy/datadog_checks/kube_proxy/data/auto_conf.yaml similarity index 100% rename from kube_proxy/auto_conf.yaml rename to kube_proxy/datadog_checks/kube_proxy/data/auto_conf.yaml diff --git a/kube_proxy/conf.yaml.example b/kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example similarity index 100% rename from kube_proxy/conf.yaml.example rename to kube_proxy/datadog_checks/kube_proxy/data/conf.yaml.example diff --git a/kube_proxy/setup.py b/kube_proxy/setup.py index 093d507b4cf35..427225f533119 100644 --- a/kube_proxy/setup.py +++ b/kube_proxy/setup.py @@ -63,6 +63,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.kube_proxy': ['conf.yaml.default', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/kubelet/MANIFEST.in b/kubelet/MANIFEST.in index 4a85790652b39..46f690a5c7885 100644 --- a/kubelet/MANIFEST.in +++ b/kubelet/MANIFEST.in @@ -1,6 +1,11 @@ +graft datadog_checks +graft tests + +include MANIFEST.in include README.md include requirements.in include requirements.txt -include tests/requirements.txt -graft datadog_checks -graft tests +include requirements-dev.txt +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/kubelet/conf.yaml.example b/kubelet/datadog_checks/kubelet/data/conf.yaml.example similarity index 100% rename from kubelet/conf.yaml.example rename to kubelet/datadog_checks/kubelet/data/conf.yaml.example diff --git a/kubelet/setup.py b/kubelet/setup.py index 408c044188853..3afd197d955b7 100644 --- a/kubelet/setup.py +++ b/kubelet/setup.py @@ -63,6 +63,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.kubelet': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/kubernetes/MANIFEST.in b/kubernetes/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/kubernetes/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/kubernetes/README.md b/kubernetes/README.md index 39827025240fe..b56fd2c3b668a 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -168,10 +168,10 @@ To get a better idea of how (or why) to integrate your Kubernetes service, check [1]: https://github.com/DataDog/datadog-agent/blob/master/docs/agent/changes.md#kubernetes-support [2]: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/ [3]: https://app.datadoghq.com/account/settings#agent -[4]: https://github.com/DataDog/integrations-core/blob/master/kubernetes/conf.yaml.example +[4]: https://github.com/DataDog/integrations-core/blob/master/kubernetes/datadog_checks/kubernetes/data/conf.yaml.example [5]: https://kubernetes.io/docs/api-reference/v1.7/#configmap-v1-core [6]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -[7]: https://github.com/DataDog/integrations-core/blob/master/kubernetes/conf.yaml.example#L118 +[7]: https://github.com/DataDog/integrations-core/blob/master/kubernetes/datadog_checks/kubernetes/data/conf.yaml.example#L118 [8]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [9]: https://github.com/DataDog/integrations-core/blob/master/kubernetes/metadata.csv [10]: http://blog.kubernetes.io/2017/03/advanced-scheduling-in-kubernetes.html diff --git a/kubernetes/conf.yaml.example b/kubernetes/datadog_checks/kubernetes/data/conf.yaml.example similarity index 100% rename from kubernetes/conf.yaml.example rename to kubernetes/datadog_checks/kubernetes/data/conf.yaml.example diff --git a/kubernetes/setup.py b/kubernetes/setup.py index 51ace333a39c1..5c61dcfd8532c 100644 --- a/kubernetes/setup.py +++ b/kubernetes/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.kubernetes': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/kubernetes_state/MANIFEST.in b/kubernetes_state/MANIFEST.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/kubernetes_state/MANIFEST.in +++ b/kubernetes_state/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/kubernetes_state/README.md b/kubernetes_state/README.md index 30a7b7ff3a67f..caea7e1982ec4 100644 --- a/kubernetes_state/README.md +++ b/kubernetes_state/README.md @@ -65,7 +65,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/kubernetes_state/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/kubernetes_state/datadog_checks/kubernetes_state/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/kubernetes_state/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/kubernetes_state/auto_conf.yaml b/kubernetes_state/datadog_checks/kubernetes_state/data/auto_conf.yaml similarity index 100% rename from kubernetes_state/auto_conf.yaml rename to kubernetes_state/datadog_checks/kubernetes_state/data/auto_conf.yaml diff --git a/kubernetes_state/conf.yaml.example b/kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example similarity index 100% rename from kubernetes_state/conf.yaml.example rename to kubernetes_state/datadog_checks/kubernetes_state/data/conf.yaml.example diff --git a/kubernetes_state/setup.py b/kubernetes_state/setup.py index 2b78749d5c719..f05251102b686 100644 --- a/kubernetes_state/setup.py +++ b/kubernetes_state/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.kubernetes_state': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/kyototycoon/MANIFEST.in b/kyototycoon/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/kyototycoon/MANIFEST.in +++ b/kyototycoon/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/kyototycoon/README.md b/kyototycoon/README.md index e64242d1e460d..9b105e2c28f3c 100644 --- a/kyototycoon/README.md +++ b/kyototycoon/README.md @@ -60,7 +60,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/kyototycoon/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/kyototycoon/datadog_checks/kyototycoon/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/kyototycoon/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/kyototycoon/auto_conf.yaml b/kyototycoon/datadog_checks/kyototycoon/data/auto_conf.yaml similarity index 100% rename from kyototycoon/auto_conf.yaml rename to kyototycoon/datadog_checks/kyototycoon/data/auto_conf.yaml diff --git a/kyototycoon/conf.yaml.example b/kyototycoon/datadog_checks/kyototycoon/data/conf.yaml.example similarity index 100% rename from kyototycoon/conf.yaml.example rename to kyototycoon/datadog_checks/kyototycoon/data/conf.yaml.example diff --git a/kyototycoon/setup.py b/kyototycoon/setup.py index d0a52ede0f1f1..9c9b7f68cff93 100644 --- a/kyototycoon/setup.py +++ b/kyototycoon/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={b'datadog_checks.kyototycoon': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/lighttpd/MANIFEST.in b/lighttpd/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/lighttpd/MANIFEST.in +++ b/lighttpd/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/lighttpd/README.md b/lighttpd/README.md index 4c510fa6a1553..654214093ce53 100644 --- a/lighttpd/README.md +++ b/lighttpd/README.md @@ -55,7 +55,7 @@ To get a better idea of how (or why) to monitor Lighttpd web server metrics with [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/lighttpd/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/lighttpd/datadog_checks/lighttpd/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/lighttpd/metadata.csv diff --git a/lighttpd/conf.yaml.example b/lighttpd/datadog_checks/lighttpd/data/conf.yaml.example similarity index 100% rename from lighttpd/conf.yaml.example rename to lighttpd/datadog_checks/lighttpd/data/conf.yaml.example diff --git a/lighttpd/setup.py b/lighttpd/setup.py index 1f3573127f022..b559146584d78 100644 --- a/lighttpd/setup.py +++ b/lighttpd/setup.py @@ -54,6 +54,5 @@ def get_requirements(fpath): tests_require=get_requirements('requirements-dev.txt'), # Extra files to ship with the wheel package - package_data={'datadog_checks.lighttpd': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/linkerd/MANIFEST.in b/linkerd/MANIFEST.in index a4add07593504..46f690a5c7885 100644 --- a/linkerd/MANIFEST.in +++ b/linkerd/MANIFEST.in @@ -1,6 +1,11 @@ -include requirements.in -include requirements.txt -include tests/requirements.txt -include README.md graft datadog_checks graft tests + +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/linkerd/README.md b/linkerd/README.md index bacb1d05b7729..2073646f92aca 100644 --- a/linkerd/README.md +++ b/linkerd/README.md @@ -13,7 +13,7 @@ The Linkerd check is included in the [Datadog Agent](https://app.datadoghq.com/a ### Configuration Edit the `linkerd.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory. -See [sample linkerd.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/linkerd/conf.yaml.example) for all available configuration options. +See [sample linkerd.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/linkerd/datadog_checks/linkerd/data/conf.yaml.example) for all available configuration options. ### Validation @@ -37,7 +37,7 @@ curl Where `linkerd_prometheus_endpoint` is the linkerd prometheus endpoint (you should use the same value as the `prometheus_url` config key in your `linkerd.yaml`) If you need to use a metric that is not provided by default, you can add an entry to `linkerd.yaml`. -Simply follow the examples present in the [default configuration](https://github.com/DataDog/integrations-core/blob/master/linkerd/conf.yaml.example). +Simply follow the examples present in the [default configuration](https://github.com/DataDog/integrations-core/blob/master/linkerd/datadog_checks/linkerd/data/conf.yaml.example). ### Service Checks diff --git a/linkerd/conf.yaml.example b/linkerd/datadog_checks/linkerd/data/conf.yaml.example similarity index 100% rename from linkerd/conf.yaml.example rename to linkerd/datadog_checks/linkerd/data/conf.yaml.example diff --git a/linkerd/setup.py b/linkerd/setup.py index a3f648f33cd48..e0d315b5f3178 100644 --- a/linkerd/setup.py +++ b/linkerd/setup.py @@ -70,6 +70,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.linkerd': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/linux_proc_extras/MANIFEST.in b/linux_proc_extras/MANIFEST.in index 6be195e8ce340..46f690a5c7885 100644 --- a/linux_proc_extras/MANIFEST.in +++ b/linux_proc_extras/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/linux_proc_extras/README.md b/linux_proc_extras/README.md index 12cfffc275b15..9bf09883680c1 100644 --- a/linux_proc_extras/README.md +++ b/linux_proc_extras/README.md @@ -38,7 +38,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/linux_proc_extras/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/linux_proc_extras/datadog_checks/linux_proc_extras/data/conf.yaml.example [3]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [4]: http://docs.datadoghq.com/help/ [5]: https://www.datadoghq.com/blog/ diff --git a/linux_proc_extras/conf.yaml.example b/linux_proc_extras/datadog_checks/linux_proc_extras/data/conf.yaml.example similarity index 100% rename from linux_proc_extras/conf.yaml.example rename to linux_proc_extras/datadog_checks/linux_proc_extras/data/conf.yaml.example diff --git a/linux_proc_extras/setup.py b/linux_proc_extras/setup.py index e05bf51bf595d..c7ea3d928362d 100644 --- a/linux_proc_extras/setup.py +++ b/linux_proc_extras/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.linux_proc_extras': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/mapreduce/MANIFEST.in b/mapreduce/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/mapreduce/MANIFEST.in +++ b/mapreduce/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/mapreduce/README.md b/mapreduce/README.md index 0469808d47d11..89b73cd317319 100644 --- a/mapreduce/README.md +++ b/mapreduce/README.md @@ -50,7 +50,7 @@ Need help? Contact [Datadog Support][5]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/mapreduce/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/mapreduce/datadog_checks/mapreduce/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/mapreduce/metadata.csv [5]: http://docs.datadoghq.com/help/ diff --git a/mapreduce/conf.yaml.example b/mapreduce/datadog_checks/mapreduce/data/conf.yaml.example similarity index 100% rename from mapreduce/conf.yaml.example rename to mapreduce/datadog_checks/mapreduce/data/conf.yaml.example diff --git a/mapreduce/setup.py b/mapreduce/setup.py index 365ae2ac1b05d..e90bce5410a84 100644 --- a/mapreduce/setup.py +++ b/mapreduce/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.mapreduce': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/marathon/MANIFEST.in b/marathon/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/marathon/MANIFEST.in +++ b/marathon/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/marathon/README.md b/marathon/README.md index 5198849e1d3cb..f99dbc0c5b3f6 100644 --- a/marathon/README.md +++ b/marathon/README.md @@ -56,7 +56,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/marathon/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/marathon/datadog_checks/marathon/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/marathon/metadata.csv diff --git a/marathon/conf.yaml.example b/marathon/datadog_checks/marathon/data/conf.yaml.example similarity index 100% rename from marathon/conf.yaml.example rename to marathon/datadog_checks/marathon/data/conf.yaml.example diff --git a/marathon/setup.py b/marathon/setup.py index a138a13fe6138..7f07b784e7c61 100644 --- a/marathon/setup.py +++ b/marathon/setup.py @@ -58,6 +58,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.marathon': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/mcache/MANIFEST.in b/mcache/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/mcache/MANIFEST.in +++ b/mcache/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/mcache/README.md b/mcache/README.md index 90742806253a9..7a76066fb8d41 100644 --- a/mcache/README.md +++ b/mcache/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/mcache/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/mcache/datadog_checks/mcache/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/mcache/metadata.csv diff --git a/mcache/auto_conf.yaml b/mcache/datadog_checks/mcache/data/auto_conf.yaml similarity index 100% rename from mcache/auto_conf.yaml rename to mcache/datadog_checks/mcache/data/auto_conf.yaml diff --git a/mcache/conf.yaml.example b/mcache/datadog_checks/mcache/data/conf.yaml.example similarity index 100% rename from mcache/conf.yaml.example rename to mcache/datadog_checks/mcache/data/conf.yaml.example diff --git a/mcache/setup.py b/mcache/setup.py index 63cbbef50177a..f9294fc5b80a0 100644 --- a/mcache/setup.py +++ b/mcache/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.mcache': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/mesos_master/MANIFEST.in b/mesos_master/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/mesos_master/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/mesos_master/README.md b/mesos_master/README.md index 539108c9af185..b58694008fab6 100644 --- a/mesos_master/README.md +++ b/mesos_master/README.md @@ -88,7 +88,7 @@ Need help? Contact [Datadog Support][103]. * [Installing Datadog on Mesos with DC/OS][104] -[101]: https://github.com/DataDog/integrations-core/blob/master/mesos_master/conf.yaml.example +[101]: https://github.com/DataDog/integrations-core/blob/master/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example [102]: https://github.com/DataDog/integrations-core/blob/master/mesos_master/metadata.csv [103]: http://docs.datadoghq.com/help/ [104]: https://www.datadoghq.com/blog/deploy-datadog-dcos/ diff --git a/mesos_master/conf.yaml.example b/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example similarity index 100% rename from mesos_master/conf.yaml.example rename to mesos_master/datadog_checks/mesos_master/data/conf.yaml.example diff --git a/mesos_master/setup.py b/mesos_master/setup.py index ce65115df080a..d84a10613a9c0 100644 --- a/mesos_master/setup.py +++ b/mesos_master/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.mesos_master': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/mesos_slave/MANIFEST.in b/mesos_slave/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/mesos_slave/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/mesos_slave/conf.yaml.example b/mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example similarity index 100% rename from mesos_slave/conf.yaml.example rename to mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example diff --git a/mesos_slave/setup.py b/mesos_slave/setup.py index 9f3fbf2d14479..e032a4cf24da7 100644 --- a/mesos_slave/setup.py +++ b/mesos_slave/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.mesos_slave': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/mongo/MANIFEST.in b/mongo/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/mongo/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/mongo/README.md b/mongo/README.md index 136c66c4d6c4a..ad22582488d33 100644 --- a/mongo/README.md +++ b/mongo/README.md @@ -137,7 +137,7 @@ Read our series of blog posts about collecting metrics from MongoDB with Datadog [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/mongo/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/mongo/datadog_checks/mongo/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/mongo/conf.yaml.example b/mongo/datadog_checks/mongo/data/conf.yaml.example similarity index 100% rename from mongo/conf.yaml.example rename to mongo/datadog_checks/mongo/data/conf.yaml.example diff --git a/mongo/setup.py b/mongo/setup.py index ea8b41c1a517d..52e582622a306 100644 --- a/mongo/setup.py +++ b/mongo/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.mongo': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/mysql/MANIFEST.in b/mysql/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/mysql/MANIFEST.in +++ b/mysql/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/mysql/conf.yaml.example b/mysql/datadog_checks/mysql/data/conf.yaml.example similarity index 100% rename from mysql/conf.yaml.example rename to mysql/datadog_checks/mysql/data/conf.yaml.example diff --git a/mysql/setup.py b/mysql/setup.py index 40a9f5aa25be1..7db06a02d96c5 100644 --- a/mysql/setup.py +++ b/mysql/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={b'datadog_checks.mysql': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/nagios/MANIFEST.in b/nagios/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/nagios/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/nagios/README.md b/nagios/README.md index c8f96d2ecf3b6..a34ce931fc1ce 100644 --- a/nagios/README.md +++ b/nagios/README.md @@ -71,7 +71,7 @@ Need help? Contact [Datadog Support][5]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/nagios/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/nagios/datadog_checks/nagios/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]: http://docs.datadoghq.com/help/ diff --git a/nagios/conf.yaml.example b/nagios/datadog_checks/nagios/data/conf.yaml.example similarity index 100% rename from nagios/conf.yaml.example rename to nagios/datadog_checks/nagios/data/conf.yaml.example diff --git a/nagios/setup.py b/nagios/setup.py index eed14076d866d..e15b498d9ff81 100644 --- a/nagios/setup.py +++ b/nagios/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.nagios': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/network/MANIFEST.in b/network/MANIFEST.in index e88b7069a9493..46f690a5c7885 100644 --- a/network/MANIFEST.in +++ b/network/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 \ No newline at end of file + +global-exclude *.py[cod] __pycache__ diff --git a/network/README.md b/network/README.md index 54907c5704b00..b2ba5856c8d14 100644 --- a/network/README.md +++ b/network/README.md @@ -56,7 +56,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/network/conf.yaml.default +[2]: https://github.com/DataDog/integrations-core/blob/master/network/datadog_checks/network/data/conf.yaml.default [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/network/metadata.csv diff --git a/network/conf.yaml.default b/network/datadog_checks/network/data/conf.yaml.default similarity index 100% rename from network/conf.yaml.default rename to network/datadog_checks/network/data/conf.yaml.default diff --git a/network/setup.py b/network/setup.py index f62582b9bf568..3a1d30f1c7159 100644 --- a/network/setup.py +++ b/network/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={b'datadog_checks.network': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/nfsstat/MANIFEST.in b/nfsstat/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/nfsstat/MANIFEST.in +++ b/nfsstat/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/nfsstat/README.md b/nfsstat/README.md index 3423e230431dc..51b45d8db0bcc 100644 --- a/nfsstat/README.md +++ b/nfsstat/README.md @@ -40,7 +40,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [1]: http://man7.org/linux/man-pages/man8/nfsiostat.8.html [2]: https://app.datadoghq.com/account/settings#agent -[3]: https://github.com/DataDog/integrations-core/blob/master/nfsstat/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/nfsstat/datadog_checks/nfsstat/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/nfsstat/metadata.csv [6]: http://docs.datadoghq.com/help/ diff --git a/nfsstat/conf.yaml.example b/nfsstat/datadog_checks/nfsstat/data/conf.yaml.example similarity index 100% rename from nfsstat/conf.yaml.example rename to nfsstat/datadog_checks/nfsstat/data/conf.yaml.example diff --git a/nfsstat/setup.py b/nfsstat/setup.py index 5252f4f95e478..806a918372f6f 100644 --- a/nfsstat/setup.py +++ b/nfsstat/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.nfsstat': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/nginx/MANIFEST.in b/nginx/MANIFEST.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/nginx/MANIFEST.in +++ b/nginx/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/nginx/README.md b/nginx/README.md index 1f6e712e2169d..9210c6c5e3904 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -213,7 +213,7 @@ Learn more about how to monitor NGINX performance metrics thanks to [our series [2]: http://nginx.org/en/docs/http/ngx_http_stub_status_module.html [3]: http://nginx.org/en/docs/http/ngx_http_status_module.html [4]: https://www.nginx.com/blog/nginx-plus-r13-released/ -[5]: https://github.com/DataDog/integrations-core/blob/master/nginx/conf.yaml.example +[5]: https://github.com/DataDog/integrations-core/blob/master/nginx/datadog_checks/nginx/data/conf.yaml.example [6]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [7]: https://docs.datadoghq.com/logs [8]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/nginx/conf.yaml.example b/nginx/datadog_checks/nginx/data/conf.yaml.example similarity index 100% rename from nginx/conf.yaml.example rename to nginx/datadog_checks/nginx/data/conf.yaml.example diff --git a/nginx/setup.py b/nginx/setup.py index 933007af0f03a..9640000388d69 100644 --- a/nginx/setup.py +++ b/nginx/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.nginx': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/ntp/MANIFEST.in b/ntp/MANIFEST.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/ntp/MANIFEST.in +++ b/ntp/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/ntp/README.md b/ntp/README.md index bc5389b6d8272..37bc532f13832 100644 --- a/ntp/README.md +++ b/ntp/README.md @@ -68,7 +68,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/ntp/conf.yaml.default +[2]: https://github.com/DataDog/integrations-core/blob/master/ntp/datadog_checks/ntp/data/conf.yaml.default [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/ntp/metadata.csv diff --git a/ntp/conf.yaml.default b/ntp/datadog_checks/ntp/data/conf.yaml.default similarity index 100% rename from ntp/conf.yaml.default rename to ntp/datadog_checks/ntp/data/conf.yaml.default diff --git a/ntp/setup.py b/ntp/setup.py index f79af6bd857ae..3d701df6ec2ab 100644 --- a/ntp/setup.py +++ b/ntp/setup.py @@ -58,6 +58,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.ntp': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/openstack/MANIFEST.in b/openstack/MANIFEST.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/openstack/MANIFEST.in +++ b/openstack/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/openstack/README.md b/openstack/README.md index ec8363dd2d4a2..e2ee5873c745f 100644 --- a/openstack/README.md +++ b/openstack/README.md @@ -119,7 +119,7 @@ See also our blog posts: [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/openstack/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/openstack/datadog_checks/openstack/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/openstack/metadata.csv diff --git a/openstack/conf.yaml.example b/openstack/datadog_checks/openstack/data/conf.yaml.example similarity index 100% rename from openstack/conf.yaml.example rename to openstack/datadog_checks/openstack/data/conf.yaml.example diff --git a/openstack/setup.py b/openstack/setup.py index 4f89e8b0f9745..c3c55da30e0c9 100644 --- a/openstack/setup.py +++ b/openstack/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={b'datadog_checks.openstack': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/oracle/MANIFEST.in b/oracle/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/oracle/MANIFEST.in +++ b/oracle/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/oracle/README.md b/oracle/README.md index f8d7d4a7e1219..e6fc8f106a259 100644 --- a/oracle/README.md +++ b/oracle/README.md @@ -13,7 +13,7 @@ In order to use the Oracle integration, either install the Oracle Instant Client #### Steps for the JDBC Driver - [Download](http://www.oracle.com/technetwork/database/application-development/jdbc/downloads/index.html) the jar file -- Add the path to the downloaded file in your $CLASSPATH, or add it to the check configuration file under `jdbc_driver_path`, as in the [sample oracle.yaml](https://github.com/DataDog/integrations-core/blob/master/oracle/conf.yaml.example). +- Add the path to the downloaded file in your $CLASSPATH, or add it to the check configuration file under `jdbc_driver_path`, as in the [sample oracle.yaml](https://github.com/DataDog/integrations-core/blob/master/oracle/datadog_checks/oracle/data/conf.yaml.example). #### Steps for the Instant Client @@ -70,7 +70,7 @@ ALTER SESSION SET "_ORACLE_SCRIPT"=true; ### Configuration -Edit the `oracle.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory to point to your server and port, set the masters to monitor. See the [sample oracle.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/oracle/conf.yaml.example) for all available configuration options. +Edit the `oracle.d/conf.yaml` file, in the `conf.d/` folder at the root of your Agent's directory to point to your server and port, set the masters to monitor. See the [sample oracle.d/conf.yaml](https://github.com/DataDog/integrations-core/blob/master/oracle/datadog_checks/oracle/data/conf.yaml.example) for all available configuration options. Configuration Options: @@ -106,7 +106,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [1]: https://www.oracle.com/technetwork/database/features/instant-client/index.htm [2]: http://upstart.ubuntu.com/cookbook/#environment-variables [3]: https://www.freedesktop.org/software/systemd/man/systemd.service.html#Command%20lines -[4]: https://github.com/DataDog/integrations-core/blob/master/oracle/conf.yaml.example +[4]: https://github.com/DataDog/integrations-core/blob/master/oracle/datadog_checks/oracle/data/conf.yaml.example [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [6]: https://github.com/DataDog/integrations-core/blob/master/oracle/metadata.csv [7]: http://docs.datadoghq.com/help/ diff --git a/oracle/conf.yaml.example b/oracle/datadog_checks/oracle/data/conf.yaml.example similarity index 100% rename from oracle/conf.yaml.example rename to oracle/datadog_checks/oracle/data/conf.yaml.example diff --git a/oracle/setup.py b/oracle/setup.py index 74608c7ed19d0..9daa82c50ace5 100644 --- a/oracle/setup.py +++ b/oracle/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.oracle': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/pdh_check/README.md b/pdh_check/README.md index db906a0c09a5e..b9a04aeba9bc8 100644 --- a/pdh_check/README.md +++ b/pdh_check/README.md @@ -31,6 +31,6 @@ The PDH check does not include any service checks at this time. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/pdh_check/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/pdh_check/datadog_checks/pdh_check/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/pdh_check/metadata.csv diff --git a/pdh_check/conf.yaml.example b/pdh_check/datadog_checks/pdh_check/data/conf.yaml.example similarity index 100% rename from pdh_check/conf.yaml.example rename to pdh_check/datadog_checks/pdh_check/data/conf.yaml.example diff --git a/pdh_check/manifest.in b/pdh_check/manifest.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/pdh_check/manifest.in +++ b/pdh_check/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/pdh_check/setup.py b/pdh_check/setup.py index 72623e8030df7..d4ec2e484b088 100644 --- a/pdh_check/setup.py +++ b/pdh_check/setup.py @@ -65,6 +65,5 @@ def get_requirements(fpath): tests_require=get_requirements('requirements-dev.txt'), # Extra files to ship with the wheel package - package_data={'datadog_checks.pdh_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/pgbouncer/MANIFEST.in b/pgbouncer/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/pgbouncer/MANIFEST.in +++ b/pgbouncer/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/pgbouncer/README.md b/pgbouncer/README.md index ea9e71ed5317e..a01eec21fd0e3 100644 --- a/pgbouncer/README.md +++ b/pgbouncer/README.md @@ -69,7 +69,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/pgbouncer/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/pgbouncer/datadog_checks/pgbouncer/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/pgbouncer/metadata.csv diff --git a/pgbouncer/conf.yaml.example b/pgbouncer/datadog_checks/pgbouncer/data/conf.yaml.example similarity index 100% rename from pgbouncer/conf.yaml.example rename to pgbouncer/datadog_checks/pgbouncer/data/conf.yaml.example diff --git a/pgbouncer/setup.py b/pgbouncer/setup.py index 9b6289a09ee88..950389ca8fc27 100644 --- a/pgbouncer/setup.py +++ b/pgbouncer/setup.py @@ -45,6 +45,5 @@ def get_requirements(fpath): install_requires=get_requirements("requirements.in") + ["datadog_checks_base"], tests_require=get_requirements("requirements-dev.txt"), # Extra files to ship with the wheel package - package_data={b'datadog_checks.pgbouncer': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/php_fpm/MANIFEST.in b/php_fpm/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/php_fpm/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/php_fpm/README.md b/php_fpm/README.md index 05fded9f08b23..3eec1ff3adfc7 100644 --- a/php_fpm/README.md +++ b/php_fpm/README.md @@ -64,7 +64,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/php_fpm/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/php_fpm/datadog_checks/php_fpm/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/php_fpm/metadata.csv diff --git a/php_fpm/conf.yaml.example b/php_fpm/datadog_checks/php_fpm/data/conf.yaml.example similarity index 100% rename from php_fpm/conf.yaml.example rename to php_fpm/datadog_checks/php_fpm/data/conf.yaml.example diff --git a/php_fpm/setup.py b/php_fpm/setup.py index f1ca6a6064ce3..4db4866c29aa4 100644 --- a/php_fpm/setup.py +++ b/php_fpm/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.php_fpm': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/postfix/MANIFEST.in b/postfix/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/postfix/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/postfix/README.md b/postfix/README.md index 751bb03080ce3..00996e2cda129 100644 --- a/postfix/README.md +++ b/postfix/README.md @@ -99,7 +99,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/postfix/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/postfix/datadog_checks/postfix/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/postfix/metadata.csv diff --git a/postfix/conf.yaml.example b/postfix/datadog_checks/postfix/data/conf.yaml.example similarity index 100% rename from postfix/conf.yaml.example rename to postfix/datadog_checks/postfix/data/conf.yaml.example diff --git a/postfix/setup.py b/postfix/setup.py index f30c342fe71a5..5abc0885819c0 100644 --- a/postfix/setup.py +++ b/postfix/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.postfix': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/postgres/MANIFEST.in b/postgres/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/postgres/MANIFEST.in +++ b/postgres/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/postgres/README.md b/postgres/README.md index a0b0e38afef5e..429b60ad9697f 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -207,7 +207,7 @@ You should also check the `/var/log/datadog/collector.log` file for more informa [13]: https://app.datadoghq.com/account/settings#agent -[14]: https://github.com/DataDog/integrations-core/blob/master/postgres/conf.yaml.example +[14]: https://github.com/DataDog/integrations-core/blob/master/postgres/datadog_checks/postgres/data/conf.yaml.example [15]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [16]: https://docs.datadoghq.com/logs [17]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/postgres/conf.yaml.example b/postgres/datadog_checks/postgres/data/conf.yaml.example similarity index 100% rename from postgres/conf.yaml.example rename to postgres/datadog_checks/postgres/data/conf.yaml.example diff --git a/postgres/setup.py b/postgres/setup.py index 25a64f9285648..08b7ab472df81 100644 --- a/postgres/setup.py +++ b/postgres/setup.py @@ -56,6 +56,5 @@ def get_requirements(fpath): tests_require=get_requirements('requirements-dev.txt'), # Extra files to ship with the wheel package - package_data={'datadog_checks.postgres': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/powerdns_recursor/MANIFEST.in b/powerdns_recursor/MANIFEST.in index 6be195e8ce340..46f690a5c7885 100644 --- a/powerdns_recursor/MANIFEST.in +++ b/powerdns_recursor/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/powerdns_recursor/README.md b/powerdns_recursor/README.md index cbe119a2af873..e89c8d9ce58bf 100644 --- a/powerdns_recursor/README.md +++ b/powerdns_recursor/README.md @@ -77,7 +77,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/powerdns_recursor/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/powerdns_recursor/datadog_checks/powerdns_recursor/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/powerdns_recursor/metadata.csv diff --git a/powerdns_recursor/conf.yaml.example b/powerdns_recursor/datadog_checks/powerdns_recursor/data/conf.yaml.example similarity index 100% rename from powerdns_recursor/conf.yaml.example rename to powerdns_recursor/datadog_checks/powerdns_recursor/data/conf.yaml.example diff --git a/powerdns_recursor/setup.py b/powerdns_recursor/setup.py index 362a8f1e91c74..cd2a23f03055a 100644 --- a/powerdns_recursor/setup.py +++ b/powerdns_recursor/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={b'datadog_checks.powerdns_recursor': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/process/MANIFEST.in b/process/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/process/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/process/README.md b/process/README.md index 3548bca2d1091..a55f047efb3f8 100644 --- a/process/README.md +++ b/process/README.md @@ -101,7 +101,7 @@ To get a better idea of how (or why) to monitor process resource consumption wit [1]: http://docs.datadoghq.com/monitoring/#process [2]: https://app.datadoghq.com/account/settings#agent -[3]: https://github.com/DataDog/integrations-core/blob/master/process/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/process/datadog_checks/process/data/conf.yaml.example [4]: https://github.com/DataDog/integrations-core/blob/master/process/datadog_checks/process/process.py#L117 [5]: https://github.com/DataDog/integrations-core/tree/master/docker_daemon [6]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent diff --git a/process/conf.yaml.example b/process/datadog_checks/process/data/conf.yaml.example similarity index 100% rename from process/conf.yaml.example rename to process/datadog_checks/process/data/conf.yaml.example diff --git a/process/setup.py b/process/setup.py index 51cc464013a90..158026ef6ff37 100644 --- a/process/setup.py +++ b/process/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.process': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/prometheus/MANIFEST.in b/prometheus/MANIFEST.in index a4add07593504..46f690a5c7885 100644 --- a/prometheus/MANIFEST.in +++ b/prometheus/MANIFEST.in @@ -1,6 +1,11 @@ -include requirements.in -include requirements.txt -include tests/requirements.txt -include README.md graft datadog_checks graft tests + +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/prometheus/conf.yaml.example b/prometheus/datadog_checks/prometheus/data/conf.yaml.example similarity index 100% rename from prometheus/conf.yaml.example rename to prometheus/datadog_checks/prometheus/data/conf.yaml.example diff --git a/prometheus/setup.py b/prometheus/setup.py index 1f8c109bfa5d2..0e98abe8e3229 100644 --- a/prometheus/setup.py +++ b/prometheus/setup.py @@ -62,6 +62,5 @@ def get_requirements(fpath): tests_require=get_requirements(path.join('tests', 'requirements.txt')), # Extra files to ship with the wheel package - package_data={'datadog_checks.prometheus': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/rabbitmq/MANIFEST.in b/rabbitmq/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/rabbitmq/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/rabbitmq/README.md b/rabbitmq/README.md index 0dc66310008b1..e6a1ed65a4d31 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -139,7 +139,7 @@ Returns CRITICAL if the Agent cannot connect to rabbitmq to collect metrics, oth [1]: https://app.datadoghq.com/account/settings#agent [2]: https://www.rabbitmq.com/management.html -[3]: https://github.com/DataDog/integrations-core/blob/master/rabbitmq/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example [4]: http://www.rabbitmq.com/management.html [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [6]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/rabbitmq/conf.yaml.example b/rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example similarity index 100% rename from rabbitmq/conf.yaml.example rename to rabbitmq/datadog_checks/rabbitmq/data/conf.yaml.example diff --git a/rabbitmq/setup.py b/rabbitmq/setup.py index d3477454ffa38..3b34e2411c02e 100644 --- a/rabbitmq/setup.py +++ b/rabbitmq/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.rabbitmq': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/redisdb/MANIFEST.in b/redisdb/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/redisdb/MANIFEST.in +++ b/redisdb/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/redisdb/README.md b/redisdb/README.md index 87e643499dc77..f3dd30317c0d3 100644 --- a/redisdb/README.md +++ b/redisdb/README.md @@ -224,7 +224,7 @@ Read our [series of blog posts][8] about how to monitor your Redis servers with [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/redisdb/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/redisdb/datadog_checks/redisdb/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/redisdb/metadata.csv diff --git a/redisdb/auto_conf.yaml b/redisdb/datadog_checks/redisdb/data/auto_conf.yaml similarity index 100% rename from redisdb/auto_conf.yaml rename to redisdb/datadog_checks/redisdb/data/auto_conf.yaml diff --git a/redisdb/conf.yaml.example b/redisdb/datadog_checks/redisdb/data/conf.yaml.example similarity index 100% rename from redisdb/conf.yaml.example rename to redisdb/datadog_checks/redisdb/data/conf.yaml.example diff --git a/redisdb/setup.py b/redisdb/setup.py index e75718bf1da97..9a8ae3c6c006c 100644 --- a/redisdb/setup.py +++ b/redisdb/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.redisdb': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/riak/MANIFEST.in b/riak/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/riak/MANIFEST.in +++ b/riak/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/riak/README.md b/riak/README.md index 7304709af4af1..6e8e6614c110b 100644 --- a/riak/README.md +++ b/riak/README.md @@ -50,7 +50,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/riak/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/riak/datadog_checks/riak/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/riak/metadata.csv diff --git a/riak/auto_conf.yaml b/riak/datadog_checks/riak/data/auto_conf.yaml similarity index 100% rename from riak/auto_conf.yaml rename to riak/datadog_checks/riak/data/auto_conf.yaml diff --git a/riak/conf.yaml.example b/riak/datadog_checks/riak/data/conf.yaml.example similarity index 100% rename from riak/conf.yaml.example rename to riak/datadog_checks/riak/data/conf.yaml.example diff --git a/riak/setup.py b/riak/setup.py index 5ffbb72a30ff5..f358369ee72ac 100644 --- a/riak/setup.py +++ b/riak/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={b'datadog_checks.riak': ['conf.yaml.example', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/riakcs/MANIFEST.in b/riakcs/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/riakcs/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/riakcs/README.md b/riakcs/README.md index b936eb28c9970..b7335cb747c9d 100644 --- a/riakcs/README.md +++ b/riakcs/README.md @@ -57,7 +57,7 @@ To get a better idea of how (or why) to monitor Riak CS performance and availabi [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/riakcs/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/riakcs/datadog_checks/riakcs/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/riakcs/metadata.csv diff --git a/riakcs/conf.yaml.example b/riakcs/datadog_checks/riakcs/data/conf.yaml.example similarity index 100% rename from riakcs/conf.yaml.example rename to riakcs/datadog_checks/riakcs/data/conf.yaml.example diff --git a/riakcs/setup.py b/riakcs/setup.py index f6c2d257bc03c..3dca56aae7026 100644 --- a/riakcs/setup.py +++ b/riakcs/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.riakcs': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/snmp/MANIFEST.in b/snmp/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/snmp/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/snmp/README.md b/snmp/README.md index 6d99d9cd7583a..abb70ee4ed7fc 100644 --- a/snmp/README.md +++ b/snmp/README.md @@ -180,7 +180,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/snmp/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/snmp/datadog_checks/snmp/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]: http://docs.datadoghq.com/help/ @@ -188,4 +188,4 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [7]: https://docs.datadoghq.com/integrations/faq/for-snmp-does-datadog-have-a-list-of-commonly-used-compatible-oids [8]: https://github.com/DataDog/dd-agent/blob/master/CHANGELOG.md#dependency-changes-3 [9]: https://stackoverflow.com/questions/35204995/build-pysnmp-mib-convert-cisco-mib-files-to-a-python-fails-on-ubuntu-14-04 -[10]: https://github.com/DataDog/integrations-core/blob/master/snmp/conf.yaml.example#L3 +[10]: https://github.com/DataDog/integrations-core/blob/master/snmp/datadog_checks/snmp/data/conf.yaml.example#L3 diff --git a/snmp/conf.yaml.example b/snmp/datadog_checks/snmp/data/conf.yaml.example similarity index 100% rename from snmp/conf.yaml.example rename to snmp/datadog_checks/snmp/data/conf.yaml.example diff --git a/snmp/setup.py b/snmp/setup.py index 8cf36d19d030c..7dec543590c0d 100644 --- a/snmp/setup.py +++ b/snmp/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.snmp': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/solr/MANIFEST.in b/solr/MANIFEST.in new file mode 100644 index 0000000000000..608aebbe7edef --- /dev/null +++ b/solr/MANIFEST.in @@ -0,0 +1,3 @@ +include README.md +include manifest.json +graft datadog_checks diff --git a/solr/README.md b/solr/README.md index c4da5eb262307..96b74a8fdb25f 100644 --- a/solr/README.md +++ b/solr/README.md @@ -267,7 +267,7 @@ You may use the `attribute` filter as follow: [1]: https://app.datadoghq.com/account/settings#agent [2]: http://docs.datadoghq.com/integrations/java/ -[3]: https://github.com/DataDog/integrations-core/blob/master/solr/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/solr/datadog_checks/solr/data/conf.yaml.example [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [6]: https://github.com/DataDog/integrations-core/blob/master/solr/metadata.csv diff --git a/solr/conf.yaml.example b/solr/datadog_checks/solr/data/conf.yaml.example similarity index 100% rename from solr/conf.yaml.example rename to solr/datadog_checks/solr/data/conf.yaml.example diff --git a/solr/metrics.yaml b/solr/datadog_checks/solr/data/metrics.yaml similarity index 100% rename from solr/metrics.yaml rename to solr/datadog_checks/solr/data/metrics.yaml diff --git a/solr/setup.py b/solr/setup.py index e4e9dcf627290..f94070c57e382 100644 --- a/solr/setup.py +++ b/solr/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.solr': ['conf.yaml.example', 'metrics.yaml']}, include_package_data=True, ) diff --git a/spark/MANIFEST.in b/spark/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/spark/MANIFEST.in +++ b/spark/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/spark/README.md b/spark/README.md index 8a99fe44e37a1..d80abd5862d64 100644 --- a/spark/README.md +++ b/spark/README.md @@ -77,7 +77,7 @@ To get Spark metrics if Spark is set up on AWS EMR, [use bootstrap actions][6] t [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/spark/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/spark/datadog_checks/spark/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/spark/metadata.csv diff --git a/spark/conf.yaml.example b/spark/datadog_checks/spark/data/conf.yaml.example similarity index 100% rename from spark/conf.yaml.example rename to spark/datadog_checks/spark/data/conf.yaml.example diff --git a/spark/setup.py b/spark/setup.py index 86c0113859b0b..c0a62961349e3 100644 --- a/spark/setup.py +++ b/spark/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.spark': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/sqlserver/MANIFEST.in b/sqlserver/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/sqlserver/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/sqlserver/README.md b/sqlserver/README.md index ce61f8d6d8f47..1c5e9135fd511 100644 --- a/sqlserver/README.md +++ b/sqlserver/README.md @@ -76,7 +76,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/sqlserver/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/sqlserver/datadog_checks/sqlserver/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/sqlserver/metadata.csv diff --git a/sqlserver/conf.yaml.example b/sqlserver/datadog_checks/sqlserver/data/conf.yaml.example similarity index 100% rename from sqlserver/conf.yaml.example rename to sqlserver/datadog_checks/sqlserver/data/conf.yaml.example diff --git a/sqlserver/setup.py b/sqlserver/setup.py index eca74a8152a2b..244a373faefa4 100644 --- a/sqlserver/setup.py +++ b/sqlserver/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.sqlserver': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/squid/MANIFEST.in b/squid/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/squid/MANIFEST.in +++ b/squid/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/squid/README.md b/squid/README.md index f9434d0ad48fc..4bc1c61197bf7 100644 --- a/squid/README.md +++ b/squid/README.md @@ -70,7 +70,7 @@ Reach out to our team and other Datadog users on [Slack][9]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/squid/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/squid/datadog_checks/squid/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/squid/metadata.csv [5]: https://docs.datadoghq.com/ diff --git a/squid/conf.yaml.example b/squid/datadog_checks/squid/data/conf.yaml.example similarity index 100% rename from squid/conf.yaml.example rename to squid/datadog_checks/squid/data/conf.yaml.example diff --git a/squid/setup.py b/squid/setup.py index f250e1eab9f19..adecb7e275ab6 100644 --- a/squid/setup.py +++ b/squid/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={b'datadog_checks.squid': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/ssh_check/MANIFEST.in b/ssh_check/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/ssh_check/MANIFEST.in +++ b/ssh_check/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/ssh_check/README.md b/ssh_check/README.md index d6f86ab872f68..52276ac060f03 100644 --- a/ssh_check/README.md +++ b/ssh_check/README.md @@ -60,7 +60,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/ssh_check/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/ssh_check/datadog_checks/ssh_check/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/ssh_check/metadata.csv diff --git a/ssh_check/conf.yaml.example b/ssh_check/datadog_checks/ssh_check/data/conf.yaml.example similarity index 100% rename from ssh_check/conf.yaml.example rename to ssh_check/datadog_checks/ssh_check/data/conf.yaml.example diff --git a/ssh_check/setup.py b/ssh_check/setup.py index ffeb3a6597d68..c09e97f8c6c69 100644 --- a/ssh_check/setup.py +++ b/ssh_check/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.ssh_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/statsd/MANIFEST.in b/statsd/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/statsd/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/statsd/README.md b/statsd/README.md index 02be1d2343d0c..eef562beac3da 100644 --- a/statsd/README.md +++ b/statsd/README.md @@ -63,7 +63,7 @@ To get a better idea of how (or why) to visualize StatsD metrics with Counts Gra [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/statsd/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/statsd/datadog_checks/statsd/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/statsd/metadata.csv diff --git a/statsd/conf.yaml.example b/statsd/datadog_checks/statsd/data/conf.yaml.example similarity index 100% rename from statsd/conf.yaml.example rename to statsd/datadog_checks/statsd/data/conf.yaml.example diff --git a/statsd/setup.py b/statsd/setup.py index d275971b53b3e..b31871e0f8518 100644 --- a/statsd/setup.py +++ b/statsd/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.statsd': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/supervisord/MANIFEST.in b/supervisord/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/supervisord/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/supervisord/README.md b/supervisord/README.md index 409daf69306cf..a7d47ec87e100 100644 --- a/supervisord/README.md +++ b/supervisord/README.md @@ -126,7 +126,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/supervisord/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/supervisord/datadog_checks/supervisord/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/supervisord/metadata.csv diff --git a/supervisord/conf.yaml.example b/supervisord/datadog_checks/supervisord/data/conf.yaml.example similarity index 100% rename from supervisord/conf.yaml.example rename to supervisord/datadog_checks/supervisord/data/conf.yaml.example diff --git a/supervisord/setup.py b/supervisord/setup.py index 513718e8976fc..5fd7ecf1c2535 100644 --- a/supervisord/setup.py +++ b/supervisord/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.supervisord': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/system_core/MANIFEST.in b/system_core/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/system_core/MANIFEST.in +++ b/system_core/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/system_core/README.md b/system_core/README.md index a1ab3a19cd5f4..c4e4bda140625 100644 --- a/system_core/README.md +++ b/system_core/README.md @@ -49,7 +49,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/system_core/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/system_core/datadog_checks/system_core/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/system_core/metadata.csv diff --git a/system_core/conf.yaml.example b/system_core/datadog_checks/system_core/data/conf.yaml.example similarity index 100% rename from system_core/conf.yaml.example rename to system_core/datadog_checks/system_core/data/conf.yaml.example diff --git a/system_core/setup.py b/system_core/setup.py index 40926eb740394..5c21d7fcc2ef6 100644 --- a/system_core/setup.py +++ b/system_core/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.system_core': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/system_swap/MANIFEST.in b/system_swap/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/system_swap/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/system_swap/README.md b/system_swap/README.md index 98b6599249f67..a073979ca5806 100644 --- a/system_swap/README.md +++ b/system_swap/README.md @@ -45,7 +45,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/system_swap/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/system_swap/datadog_checks/system_swap/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/system_swap/metadata.csv diff --git a/system_swap/conf.yaml.example b/system_swap/datadog_checks/system_swap/data/conf.yaml.example similarity index 100% rename from system_swap/conf.yaml.example rename to system_swap/datadog_checks/system_swap/data/conf.yaml.example diff --git a/system_swap/setup.py b/system_swap/setup.py index 3f716ebe39067..b75fedad5d666 100644 --- a/system_swap/setup.py +++ b/system_swap/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.system_swap': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/tasks/test.py b/tasks/test.py index cc0cb7464ef12..524fc48458bd2 100644 --- a/tasks/test.py +++ b/tasks/test.py @@ -125,6 +125,9 @@ def test(ctx, targets=None, changed_only=False, bench=False, dry_run=False): if bench: sys.stdout.write('\nRunning available benchmarks...\n') + # sort targets + targets.sort() + for target in targets: # check requirements.in and requirements.txt are in sync if not bench: diff --git a/tcp_check/MANIFEST.in b/tcp_check/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/tcp_check/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/tcp_check/README.md b/tcp_check/README.md index 5b87055d9b516..06e40eb5f7e5f 100644 --- a/tcp_check/README.md +++ b/tcp_check/README.md @@ -64,7 +64,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/tcp_check/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/tcp_check/datadog_checks/tcp_check/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/tcp_check/metadata.csv diff --git a/tcp_check/conf.yaml.example b/tcp_check/datadog_checks/tcp_check/data/conf.yaml.example similarity index 100% rename from tcp_check/conf.yaml.example rename to tcp_check/datadog_checks/tcp_check/data/conf.yaml.example diff --git a/tcp_check/setup.py b/tcp_check/setup.py index e301588a221fe..e42c71d059c55 100644 --- a/tcp_check/setup.py +++ b/tcp_check/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.tcp_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/teamcity/MANIFEST.in b/teamcity/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/teamcity/MANIFEST.in +++ b/teamcity/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/teamcity/README.md b/teamcity/README.md index 02019fe967288..0eaf4e694977b 100644 --- a/teamcity/README.md +++ b/teamcity/README.md @@ -62,7 +62,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent [2]: https://confluence.jetbrains.com/display/TCD9/Enabling+Guest+Login -[3]: https://github.com/DataDog/integrations-core/blob/master/teamcity/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/teamcity/datadog_checks/teamcity/data/conf.yaml.example [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [6]: http://docs.datadoghq.com/help/ diff --git a/teamcity/conf.yaml.example b/teamcity/datadog_checks/teamcity/data/conf.yaml.example similarity index 100% rename from teamcity/conf.yaml.example rename to teamcity/datadog_checks/teamcity/data/conf.yaml.example diff --git a/teamcity/setup.py b/teamcity/setup.py index 47a3e93c8dce8..9460035294739 100644 --- a/teamcity/setup.py +++ b/teamcity/setup.py @@ -54,6 +54,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.teamcity': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/tokumx/MANIFEST.in b/tokumx/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/tokumx/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/tokumx/README.md b/tokumx/README.md index d0c617df0c524..c6661cb38fcf2 100644 --- a/tokumx/README.md +++ b/tokumx/README.md @@ -91,7 +91,7 @@ Need help? Contact [Datadog Support][7]. [1]: https://app.datadoghq.com/account/settings#agent [2]: http://www.mongodb.org/display/DOCS/Security+and+Authentication -[3]: https://github.com/DataDog/integrations-core/blob/master/tokumx/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/tokumx/datadog_checks/tokumx/data/conf.yaml.example [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [6]: https://github.com/DataDog/integrations-core/blob/master/tokumx/metadata.csv diff --git a/tokumx/conf.yaml.example b/tokumx/datadog_checks/tokumx/data/conf.yaml.example similarity index 100% rename from tokumx/conf.yaml.example rename to tokumx/datadog_checks/tokumx/data/conf.yaml.example diff --git a/tokumx/setup.py b/tokumx/setup.py index 103274f2360a1..b291c603c0a4e 100644 --- a/tokumx/setup.py +++ b/tokumx/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.tokumx': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/tomcat/MANIFEST.in b/tomcat/MANIFEST.in new file mode 100644 index 0000000000000..608aebbe7edef --- /dev/null +++ b/tomcat/MANIFEST.in @@ -0,0 +1,3 @@ +include README.md +include manifest.json +graft datadog_checks diff --git a/tomcat/README.md b/tomcat/README.md index e86b136699df5..f96d8e8196b6b 100644 --- a/tomcat/README.md +++ b/tomcat/README.md @@ -338,7 +338,7 @@ The `datadog-agent jmx` command was added in version 4.1.0. [14]: http://tomcat.apache.org/tomcat-6.0-doc/monitoring.html [15]: http://docs.datadoghq.com/integrations/java/ [16]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent -[17]: https://github.com/DataDog/integrations-core/blob/master/tomcat/conf.yaml.example +[17]: https://github.com/DataDog/integrations-core/blob/master/tomcat/datadog_checks/tomcat/data/conf.yaml.example [18]: http://tomcat.apache.org/tomcat-7.0-doc/logging.html [19]: https://docs.datadoghq.com/logs/processing/#integration-pipelines [20]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information diff --git a/tomcat/auto_conf.yaml b/tomcat/datadog_checks/tomcat/data/auto_conf.yaml similarity index 100% rename from tomcat/auto_conf.yaml rename to tomcat/datadog_checks/tomcat/data/auto_conf.yaml diff --git a/tomcat/conf.yaml.example b/tomcat/datadog_checks/tomcat/data/conf.yaml.example similarity index 100% rename from tomcat/conf.yaml.example rename to tomcat/datadog_checks/tomcat/data/conf.yaml.example diff --git a/tomcat/metrics.yaml b/tomcat/datadog_checks/tomcat/data/metrics.yaml similarity index 100% rename from tomcat/metrics.yaml rename to tomcat/datadog_checks/tomcat/data/metrics.yaml diff --git a/tomcat/setup.py b/tomcat/setup.py index 387fc4228082f..c91eed6900e8b 100644 --- a/tomcat/setup.py +++ b/tomcat/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.tomcat': ['conf.yaml.example', 'metrics.yaml', 'auto_conf.yaml']}, include_package_data=True, ) diff --git a/twemproxy/MANIFEST.in b/twemproxy/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/twemproxy/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/twemproxy/README.md b/twemproxy/README.md index 17133e345e425..c6292e342967a 100644 --- a/twemproxy/README.md +++ b/twemproxy/README.md @@ -49,7 +49,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/twemproxy/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/twemproxy/datadog_checks/twemproxy/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/twemproxy/metadata.csv diff --git a/twemproxy/conf.yaml.example b/twemproxy/datadog_checks/twemproxy/data/conf.yaml.example similarity index 100% rename from twemproxy/conf.yaml.example rename to twemproxy/datadog_checks/twemproxy/data/conf.yaml.example diff --git a/twemproxy/setup.py b/twemproxy/setup.py index 146a310e0c196..e9eb4d603f7c9 100644 --- a/twemproxy/setup.py +++ b/twemproxy/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.twemproxy': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/varnish/MANIFEST.in b/varnish/MANIFEST.in index 8cff9b2a012f7..46f690a5c7885 100644 --- a/varnish/MANIFEST.in +++ b/varnish/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 \ No newline at end of file +include manifest.json + +global-exclude *.py[cod] __pycache__ diff --git a/varnish/README.md b/varnish/README.md index 7db5ed57213e3..1a1472a022d38 100644 --- a/varnish/README.md +++ b/varnish/README.md @@ -124,7 +124,7 @@ Need help? Contact [Datadog Support][7]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/varnish/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/varnish/datadog_checks/varnish/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/varnish/conf.yaml.example b/varnish/datadog_checks/varnish/data/conf.yaml.example similarity index 100% rename from varnish/conf.yaml.example rename to varnish/datadog_checks/varnish/data/conf.yaml.example diff --git a/varnish/setup.py b/varnish/setup.py index ba90aad781fb5..fe92bffbf5eef 100644 --- a/varnish/setup.py +++ b/varnish/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={b'datadog_checks.varnish': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/vault/MANIFEST.in b/vault/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/vault/MANIFEST.in +++ b/vault/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/vault/README.md b/vault/README.md index 2f9b498b16cc8..959c89d6053b2 100644 --- a/vault/README.md +++ b/vault/README.md @@ -55,7 +55,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [1]: https://www.vaultproject.io [2]: https://app.datadoghq.com/account/settings#agent -[3]: https://github.com/DataDog/integrations-core/blob/master/vault/conf.yaml.example +[3]: https://github.com/DataDog/integrations-core/blob/master/vault/datadog_checks/vault/data/conf.yaml.example [4]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [5]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [6]: http://docs.datadoghq.com/help/ diff --git a/vault/conf.yaml.example b/vault/datadog_checks/vault/data/conf.yaml.example similarity index 100% rename from vault/conf.yaml.example rename to vault/datadog_checks/vault/data/conf.yaml.example diff --git a/vault/setup.py b/vault/setup.py index f394473c4e3e0..60f768da95b01 100644 --- a/vault/setup.py +++ b/vault/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.vault': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/vsphere/MANIFEST.in b/vsphere/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/vsphere/MANIFEST.in +++ b/vsphere/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/vsphere/README.md b/vsphere/README.md index a7fdecd1df27c..bf657a87b5b59 100644 --- a/vsphere/README.md +++ b/vsphere/README.md @@ -82,7 +82,7 @@ See our [blog post][7] on monitoring vSphere environments with Datadog. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/vsphere/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/vsphere/datadog_checks/vsphere/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/vsphere/metadata.csv diff --git a/vsphere/conf.yaml.example b/vsphere/datadog_checks/vsphere/data/conf.yaml.example similarity index 100% rename from vsphere/conf.yaml.example rename to vsphere/datadog_checks/vsphere/data/conf.yaml.example diff --git a/vsphere/setup.py b/vsphere/setup.py index 5011fe4a38769..f6288ed8f1c96 100644 --- a/vsphere/setup.py +++ b/vsphere/setup.py @@ -54,6 +54,5 @@ def get_requirements(fpath): tests_require=get_requirements('requirements-dev.txt'), # Extra files to ship with the wheel package - package_data={'datadog_checks.vsphere': ['conf.yaml.default']}, include_package_data=True, ) diff --git a/win32_event_log/MANIFEST.in b/win32_event_log/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/win32_event_log/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/win32_event_log/README.md b/win32_event_log/README.md index db8b20cd7b247..54d2b6916319b 100644 --- a/win32_event_log/README.md +++ b/win32_event_log/README.md @@ -55,7 +55,7 @@ Need help? Contact [Datadog Support][5]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/win32_event_log/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/win32_event_log/datadog_checks/win32_event_log/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]: http://docs.datadoghq.com/help/ diff --git a/win32_event_log/conf.yaml.example b/win32_event_log/datadog_checks/win32_event_log/data/conf.yaml.example similarity index 100% rename from win32_event_log/conf.yaml.example rename to win32_event_log/datadog_checks/win32_event_log/data/conf.yaml.example diff --git a/win32_event_log/setup.py b/win32_event_log/setup.py index d82ea4a604442..40a94114e28c7 100644 --- a/win32_event_log/setup.py +++ b/win32_event_log/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.win32_event_log': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/windows_service/MANIFEST.in b/windows_service/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/windows_service/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/windows_service/README.md b/windows_service/README.md index 4929e2b22f70b..69eef6195d0b3 100644 --- a/windows_service/README.md +++ b/windows_service/README.md @@ -70,7 +70,7 @@ Need help? Contact [Datadog Support][5]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/windows_service/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/windows_service/datadog_checks/windows_service/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]: http://docs.datadoghq.com/help/ diff --git a/windows_service/conf.yaml.example b/windows_service/datadog_checks/windows_service/data/conf.yaml.example similarity index 100% rename from windows_service/conf.yaml.example rename to windows_service/datadog_checks/windows_service/data/conf.yaml.example diff --git a/windows_service/setup.py b/windows_service/setup.py index f4d4d1a7a737c..0efe3256a2d23 100644 --- a/windows_service/setup.py +++ b/windows_service/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.windows_service': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/wmi_check/MANIFEST.in b/wmi_check/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/wmi_check/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/wmi_check/conf.yaml.example b/wmi_check/datadog_checks/wmi_check/data/conf.yaml.example similarity index 100% rename from wmi_check/conf.yaml.example rename to wmi_check/datadog_checks/wmi_check/data/conf.yaml.example diff --git a/wmi_check/setup.py b/wmi_check/setup.py index c070084b4d8c1..fd00edcd54250 100644 --- a/wmi_check/setup.py +++ b/wmi_check/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.wmi_check': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/yarn/MANIFEST.in b/yarn/MANIFEST.in index 03fd6943f6ea7..46f690a5c7885 100644 --- a/yarn/MANIFEST.in +++ b/yarn/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/yarn/README.md b/yarn/README.md index a61fcad63089c..bb17d793f3e9c 100644 --- a/yarn/README.md +++ b/yarn/README.md @@ -60,7 +60,7 @@ Need help? Contact [Datadog Support][6]. [1]: https://app.datadoghq.com/account/settings#agent -[2]: https://github.com/DataDog/integrations-core/blob/master/yarn/conf.yaml.example +[2]: https://github.com/DataDog/integrations-core/blob/master/yarn/datadog_checks/yarn/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/yarn/metadata.csv diff --git a/yarn/conf.yaml.example b/yarn/datadog_checks/yarn/data/conf.yaml.example similarity index 100% rename from yarn/conf.yaml.example rename to yarn/datadog_checks/yarn/data/conf.yaml.example diff --git a/yarn/setup.py b/yarn/setup.py index 422458ec4623b..d9d684d2cf80b 100644 --- a/yarn/setup.py +++ b/yarn/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.yarn': ['conf.yaml.example']}, include_package_data=True, ) diff --git a/zk/MANIFEST.in b/zk/MANIFEST.in new file mode 100644 index 0000000000000..397e2659c7490 --- /dev/null +++ b/zk/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/zk/README.md b/zk/README.md index 69798be873ad3..80dccc3d6600b 100644 --- a/zk/README.md +++ b/zk/README.md @@ -139,7 +139,7 @@ Learn more about infrastructure monitoring and all our integrations on [our blog [13]: https://app.datadoghq.com/account/settings#agent -[14]: https://github.com/DataDog/integrations-core/blob/master/zk/conf.yaml.example +[14]: https://github.com/DataDog/integrations-core/blob/master/zk/datadog_checks/zk/data/conf.yaml.example [15]: https://docs.datadoghq.com/agent/faq/agent-commands/#start-stop-restart-the-agent [16]: https://docs.datadoghq.com/agent/faq/agent-commands/#agent-status-and-information [17]: https://github.com/DataDog/integrations-core/blob/master/zk/metadata.csv diff --git a/zk/conf.yaml.example b/zk/datadog_checks/zk/data/conf.yaml.example similarity index 100% rename from zk/conf.yaml.example rename to zk/datadog_checks/zk/data/conf.yaml.example diff --git a/zk/setup.py b/zk/setup.py index 98a145e1c51ff..9567b0f975dd1 100644 --- a/zk/setup.py +++ b/zk/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.zk': ['conf.yaml.example']}, include_package_data=True, )