Fix merge conflicts

DataDog · Dec 12, 2024 · 1867002 · 1867002
2 parents d54b74f + 357cfb1
commit 1867002
Show file tree

Hide file tree

Showing 70 changed files with 4,346 additions and 251 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -67,6 +67,10 @@ coverage:
         target: 75
         flags:
         - jfrog_platform_self_hosted
+      Kepler:
+        target: 75
+        flags:
+        - kepler
       Kernelcare:
         target: 75
         flags:
@@ -432,6 +436,11 @@ flags:
     paths:
     - jfrog_platform_self_hosted/datadog_checks/jfrog_platform_self_hosted
     - jfrog_platform_self_hosted/tests
+  kepler:
+    carryforward: true
+    paths:
+    - kepler/datadog_checks/kepler
+    - kepler/tests
   kernelcare:
     carryforward: true
     paths:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -61,7 +61,7 @@
 /doctordroid/                            @dimittal @DataDog/ecosystems-review
 /dylibso-webassembly/                  @nilslice @bhelx @DataDog/ecosystems-review
 /doppler/                                @nmanoogian @apazzolini @doppler-admin @DataDog/ecosystems-review
-/doppler/assets/logs/                    @nmanoogian @apazzolini @doppler-admin @DataDog/ecosystems-review @DataDog/logs-backend
+/doppler/assets/logs/                    @nmanoogian @apazzolini @doppler-admin @DataDog/ecosystems-review @DataDog/logs-backend @DataDog/logs-core
 /embrace_mobile/                         @jpmunz @joage @DataDog/ecosystems-review
 /eppo/                                   @emetelka [email protected]
 /eventstore/                             @Xorima
@@ -107,6 +107,7 @@
 /kameleoon/                              @slava-inyu [email protected] @DataDog/ecosystems-review
 /kernelcare/                             @grubberr [email protected]
 /keep/                                   @talboren [email protected] @DataDog/documentation
+/kepler/                                 @sarah-witt
 /komodor/                                @komodorio/sales-engineers @DataDog/ecosystems-review
 /launchdarkly/                           [email protected] @DataDog/ecosystems-review
 /lacework/                               @DataDog/agent-integrations
@@ -493,7 +494,7 @@
 /gitea/assets/dashboards                    @FlorentClarret @DataDog/documentation @DataDog/reporting-and-sharing @DataDog/agent-integrations
 /gitea/assets/monitors                      @FlorentClarret @DataDog/documentation @DataDog/alerting-product @DataDog/agent-integrations
 
-/gigamon/assets/logs/                       @Mrudula-Oruganti-Gigamon @DataDog/logs-backend
+/gigamon/assets/logs/                       @Mrudula-Oruganti-Gigamon @DataDog/logs-backend @DataDog/logs-core
 /gnatsd_streaming/*metadata.csv          @stephenprater @jaredhoyt [email protected] @DataDog/documentation
 /gnatsd_streaming/manifest.json          @stephenprater @jaredhoyt [email protected] @DataDog/documentation
 /gnatsd_streaming/README.md              @stephenprater @jaredhoyt [email protected] @DataDog/documentation
@@ -1136,7 +1137,7 @@
 /anecdote/manifest.json                    @atyulyutaev @DataDog/documentation @DataDog/ecosystems-review
 /anecdote/assets/dashboards                    @atyulyutaev @DataDog/documentation @DataDog/dashboards-backend @DataDog/agent-integrations
 /anecdote/assets/monitors                      @atyulyutaev @DataDog/documentation @DataDog/monitor-app @DataDog/agent-integrations
-/anecdote/assets/logs/                         @atyulyutaev @DataDog/agent-integrations @DataDog/logs-backend
+/anecdote/assets/logs/                         @atyulyutaev @DataDog/agent-integrations @DataDog/logs-backend @DataDog/logs-core
 /anecdote/README.md                        @atyulyutaev @DataDog/documentation @DataDog/ecosystems-review
 
 /celerdata/*metadata.csv                     @yandongxiao [email protected] @DataDog/documentation @DataDog/ecosystems-review
@@ -1147,8 +1148,10 @@
 
 /oceanbasecloud/                             @kyle-oceanbase [email protected] @DataDog/ecosystems-review
 
+/zilliz_cloud_zilliz_cloud/                 @DataDog/ecosystems-review
+
 /spicedb/ @tstirrat15 @DataDog/ecosystems-review
 
 # LEAVE THE FOLLOWING LOG OWNERSHIP LAST IN THE FILE
 # Make sure logs team is the full owner for all logs related files
-**/assets/logs/                          @DataDog/logs-backend
+**/assets/logs/                          @DataDog/logs-backend @DataDog/logs-core
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -22,5 +22,10 @@ jobs:
     concurrency:
       group: test-results
 
+    permissions: # For test-results-master.yml
+      checks: write
+      pull-requests: write
+      contents: write
+
     uses: DataDog/integrations-core/.github/workflows/test-results-master.yml@master
     secrets: inherit
diff --git a/.github/workflows/publish-test-results-pr.yml b/.github/workflows/publish-test-results-pr.yml
@@ -11,7 +11,9 @@ jobs:
   publish:
     uses: DataDog/integrations-core/.github/workflows/test-results-pr.yml@master
     if: github.event.workflow_run.conclusion != 'skipped'
-    permissions:
+    permissions: # For test-results-pr.yml
       checks: write
       pull-requests: write
+      contents: read
+      actions: read
     secrets: inherit
diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml
@@ -505,6 +505,25 @@ jobs:
       test-py3: ${{ inputs.test-py3 }}
       setup-env-vars: "${{ inputs.setup-env-vars }}"
     secrets: inherit
+  j43aee0d:
+    uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
+    with:
+      job-name: Kepler
+      target: kepler
+      platform: linux
+      runner: '["ubuntu-22.04"]'
+      repo: "${{ inputs.repo }}"
+      python-version: "${{ inputs.python-version }}"
+      standard: ${{ inputs.standard }}
+      latest: ${{ inputs.latest }}
+      agent-image: "${{ inputs.agent-image }}"
+      agent-image-py2: "${{ inputs.agent-image-py2 }}"
+      agent-image-windows: "${{ inputs.agent-image-windows }}"
+      agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
+      test-py2: ${{ inputs.test-py2 }}
+      test-py3: ${{ inputs.test-py3 }}
+      setup-env-vars: "${{ inputs.setup-env-vars }}"
+    secrets: inherit
   ja3e78b9:
     uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
     with:

diff --git a/.in-toto/tag.97d0579e.link b/.in-toto/tag.97d0579e.link
diff --git a/.in-toto/tag.c0daa59b.link b/.in-toto/tag.c0daa59b.link
diff --git a/doctordroid/assets/oauth_clients.json b/doctordroid/assets/oauth_clients.json
@@ -1,29 +1,30 @@
 {
   "integration": {
-    "client_role": "integration",
     "scopes": [
-      "api_keys_write",
-      "apm_service_catalog_read",
-      "incident_settings_write",
-      "slos_read",
       "monitors_read",
-      "timeseries_query",
-      "incident_write",
       "events_read",
       "create_webhooks",
-      "dashboards_read",
-      "ci_visibility_read",
+      "incident_read",
+      "apm_service_catalog_read",
+      "timeseries_query",
       "incident_notification_settings_write",
+      "incident_write",
+      "apm_api_catalog_read",
       "metrics_read",
-      "incident_read"
+      "api_keys_write",
+      "dashboards_read",
+      "apm_read",
+      "slos_read",
+      "incident_settings_write",
+      "ci_visibility_read"
     ],
+    "client_role": "integration",
+    "name": "Doctor Droid",
+    "onboarding_url": "https://playbooks.drdroid.io/datadog-login",
+    "description": "Doctor Droid",
     "redirect_uris": [
-      "https://app.drdroid.io/connectors/integrations/handlers/datadog/r2d2/oauth_redirect",
-      "https://alertops-app.drdroid.io/connectors/integrations/handlers/datadog/r2d2/oauth_redirect"
+      "https://playbooks.drdroid.io/connectors/integrations/handlers/datadog/r2d2/oauth_redirect"
     ],
-    "description": "Doctor Droid",
-    "name": "Doctor Droid",
-    "onboarding_url": "https://alertops-app.drdroid.io/datadog-login",
     "id": "03325090-9e7e-11ee-8f18-da7ad0900002"
   }
-}
+}