Bump minimum package (DataDog#8443)

* Bump minimun base package required by integrations Co-authored-by: Florimond Manca <[email protected]>
kkourtchikov · Feb 1, 2021 · edcf124 · edcf124
1 parent 2e412ac
commit edcf124
Show file tree

Hide file tree

Showing 135 changed files with 149 additions and 132 deletions.
diff --git a/.azure-pipelines/nightly_latest_base.yml b/.azure-pipelines/nightly_latest_base.yml
@@ -22,6 +22,7 @@ jobs:
   parameters:
     run_py2_tests: false  # Handled via separate nightly
     force_base_package: true
+    test_e2e: false  # e2e tests run in a docker image so the base package wont be forced
     pip_cache_config:
       key: 'pip | $(Agent.OS) | datadog_checks_base/datadog_checks/base/data/agent_requirements.in'
       restoreKeys: |

diff --git a/.azure-pipelines/templates/checkout-code.yml b/.azure-pipelines/templates/checkout-code.yml
@@ -8,11 +8,18 @@ steps:
 
 # Azure checks out the code from the PR but leaves us in a detached state.
 # Because ddev cannot work in that state, we create a branch.
-# Only applies to PRs
+# Only applies to PRs and manual runs
 - script: git checkout -B azure/$(System.PullRequest.SourceBranch)
   condition: eq(variables['Build.Reason'], 'PullRequest')
   displayName: 'Create branch from PR'
 
+# Azure checks out the code from the PR but leaves us in a detached state.
+# Because ddev cannot work in that state, we create a branch.
+# Only applies to PRs and manual runs
+- script: git checkout -B azure/$(Build.SourceBranch)
+  condition: eq(variables['Build.Reason'], 'Manual')
+  displayName: 'Create branch from branch (manual build)'
+
 # Azure pulls a commit hash via git fetch rather than clone so
 # we checkout the branches we need which also gets us out of a
 # detached HEAD state. This may be fixed soon, see:
@@ -25,3 +32,9 @@ steps:
 - script: git checkout azure/$(System.PullRequest.SourceBranch)
   condition: eq(variables['Build.Reason'], 'PullRequest')
   displayName: 'Checkout branch'
+
+# Switch to the branch where the manual run is triggered. Also see:
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables#system-variables
+- script: git checkout azure/$(Build.SourceBranch)
+  condition: eq(variables['Build.Reason'], 'Manual')
+  displayName: 'Checkout branch (manual build)'
diff --git a/.azure-pipelines/templates/run-tests.yml b/.azure-pipelines/templates/run-tests.yml
@@ -10,7 +10,7 @@ parameters:
   force_base_package: false
 
 steps:
-- ${{ if and(eq(parameters.test, 'true'), eq(parameters.coverage, 'true')) }}:
+- ${{ if and(eq(parameters.test, 'true'), eq(parameters.coverage, 'true'), eq(parameters.force_base_package, 'false')) }}:
   - script: ddev test --cov --junit ${{ parameters.check }}
     displayName: 'Run Unit/Integration tests'
     env:

diff --git a/.azure-pipelines/templates/test-all-checks.yml b/.azure-pipelines/templates/test-all-checks.yml
@@ -10,6 +10,7 @@ jobs:
     pip_cache_config: ${{ parameters.pip_cache_config }}
     run_py2_tests: ${{ parameters.run_py2_tests }}
     force_base_package: ${{ parameters.force_base_package }}
+    test_e2e: ${{ parameters.test_e2e }}
     checks:
     - checkName: datadog_checks_base
       displayName: Datadog Checks Base (Linux)

diff --git a/.azure-pipelines/templates/test-all.yml b/.azure-pipelines/templates/test-all.yml
@@ -19,6 +19,7 @@ jobs:
       pip_cache_config: ${{ parameters.pip_cache_config }}
       run_py2_tests: ${{ parameters.run_py2_tests }}
       force_base_package: ${{ parameters.force_base_package }}
+      test_e2e: ${{ parameters.test_e2e }}
 
       # Avoid max step limits
       ${{ if eq(check.checkName, 'datadog_checks_base') }}:

diff --git a/active_directory/setup.py b/active_directory/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 setup(
     name='datadog-active_directory',

diff --git a/activemq/setup.py b/activemq/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 
 setup(

diff --git a/activemq_xml/setup.py b/activemq_xml/setup.py
@@ -29,7 +29,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 setup(
     name='datadog-activemq_xml',

diff --git a/aerospike/setup.py b/aerospike/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=4.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 
 setup(

diff --git a/airflow/setup.py b/airflow/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=4.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/ambari/setup.py b/ambari/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=7.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/apache/setup.py b/apache/setup.py
@@ -37,7 +37,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-apache',

diff --git a/azure_iot_edge/setup.py b/azure_iot_edge/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 
 setup(

diff --git a/btrfs/setup.py b/btrfs/setup.py
@@ -26,7 +26,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-btrfs',

diff --git a/cacti/setup.py b/cacti/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-cacti',

diff --git a/cassandra/setup.py b/cassandra/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/cassandra_nodetool/setup.py b/cassandra_nodetool/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/ceph/setup.py b/ceph/setup.py
@@ -26,7 +26,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-ceph',

diff --git a/cisco_aci/setup.py b/cisco_aci/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-cisco_aci',

diff --git a/clickhouse/setup.py b/clickhouse/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.0.0'
 
 
 setup(

diff --git a/cloud_foundry_api/setup.py b/cloud_foundry_api/setup.py
@@ -18,7 +18,7 @@
     long_description = f.read()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/confluent_platform/setup.py b/confluent_platform/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/consul/setup.py b/consul/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 setup(
     name='datadog-consul',

diff --git a/coredns/setup.py b/coredns/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 
 setup(

diff --git a/couch/setup.py b/couch/setup.py
@@ -30,7 +30,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.8.0'
 
 setup(
     name='datadog-couch',

diff --git a/couchbase/setup.py b/couchbase/setup.py
@@ -30,7 +30,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-couchbase',

diff --git a/...g_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/setup.py b/...g_checks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/setup.py
@@ -25,7 +25,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/...og_checks_dev/datadog_checks/dev/tooling/templates/integration/logs/{check_name}/setup.py b/...og_checks_dev/datadog_checks/dev/tooling/templates/integration/logs/{check_name}/setup.py
@@ -25,7 +25,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/directory/setup.py b/directory/setup.py
@@ -30,7 +30,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-directory',

diff --git a/disk/setup.py b/disk/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=4.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 setup(
     name='datadog-disk',

diff --git a/dns_check/setup.py b/dns_check/setup.py
@@ -28,7 +28,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-dns_check',

diff --git a/dotnetclr/setup.py b/dotnetclr/setup.py
@@ -25,7 +25,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.4.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.8.0'
 
 setup(
     name='datadog-dotnetclr',

diff --git a/druid/setup.py b/druid/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/ecs_fargate/setup.py b/ecs_fargate/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-ecs_fargate',

diff --git a/eks_fargate/setup.py b/eks_fargate/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 
 setup(

diff --git a/elastic/setup.py b/elastic/setup.py
@@ -29,7 +29,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-elastic',

diff --git a/envoy/setup.py b/envoy/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.8.0'
 
 setup(
     name='datadog-envoy',

diff --git a/exchange_server/setup.py b/exchange_server/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=4.2.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-exchange_server',

diff --git a/external_dns/setup.py b/external_dns/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-external_dns',

diff --git a/fluentd/setup.py b/fluentd/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.1.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-fluentd',

diff --git a/gearmand/setup.py b/gearmand/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=11.2.0'
 
 setup(
     name='datadog-gearmand',

diff --git a/gitlab/setup.py b/gitlab/setup.py
@@ -27,7 +27,7 @@ def get_dependencies():
         return f.readlines()
 
 
-CHECKS_BASE_REQ = 'datadog-checks-base>=15.4.0'
+CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
 
 setup(
     name='datadog-gitlab',
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ def get_dependencies(): @@
             return f.readlines()
-    CHECKS_BASE_REQ = 'datadog-checks-base'
+    CHECKS_BASE_REQ = 'datadog-checks-base>=15.7.0'
     setup(
@@ Expand Down @@