Skip to content

Commit 50342e5

Browse files
authored
Merge branch 'redis-field-engineering:master' into redis_enterprise_prometheus_v2_metrics
2 parents c1ae337 + dff42e2 commit 50342e5

File tree

166 files changed

+15060
-438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+15060
-438
lines changed

.codecov.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,10 @@ coverage:
179179
target: 75
180180
flags:
181181
- redpanda
182+
Resilience4j:
183+
target: 75
184+
flags:
185+
- resilience4j
182186
Riak_MDC_Replication:
183187
target: 75
184188
flags:
@@ -595,6 +599,11 @@ flags:
595599
paths:
596600
- redpanda/datadog_checks/redpanda
597601
- redpanda/tests
602+
resilience4j:
603+
carryforward: true
604+
paths:
605+
- resilience4j/datadog_checks/resilience4j
606+
- resilience4j/tests
598607
riak_repl:
599608
carryforward: true
600609
paths:

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
/instabug/ @AbdallahHemdan ahemdan@instabug.com @DataDog/ecosystems-review
102102
/invary/ @tim-invary @DataDog/ecosystems-review
103103
/ilert/ @yacut support@ilert.com @DataDog/ecosystems-review
104+
/inngest/ @DataDog/ecosystems-review
104105
/insightfinder/ @dearmore @erinlmcmahon support@insightfinder.com @DataDog/ecosystems-review
105106
/isdown/ @ntomas support@isdown.app @DataDog/ecosystems-review
106107
/jamf_protect/ @DataDog/saas-integrations
@@ -152,6 +153,7 @@
152153
/postman/ @shashankawasthi88 integrations-partnerships@postman.com @DataDog/ecosystems-review
153154
/pulsar/ @zzzming itestmycode@gmail.com
154155
/pulumi/ @isaac-pulumi team@pulumi.com @DataDog/ecosystems-review
156+
/pulse/ @DataDog/ecosystems-review
155157
/puma/ @plasticine
156158
/purefa/ @chrroberts-pure pure-observability@purestorage.com @DataDog/ecosystems-review
157159
/purefb/ @chrroberts-pure pure-observability@purestorage.com @DataDog/ecosystems-review
@@ -165,6 +167,7 @@
165167
/redis_enterprise_prometheus/ @redis-field-engineering field.engineers@redis.com
166168
/redis_sentinel/ @DataDog/agent-integrations
167169
/redpanda/ @redpanda-data support@redpanda.com
170+
/resilience4j/ @willianccs willianccs@gmail.com
168171
/resin/ @brentm5
169172
/retool/ @jamiecuffe @DataDog/ecosystems-review
170173
/riak_repl/ @abtreece
@@ -1153,14 +1156,17 @@
11531156

11541157
/oceanbasecloud/ @kyle-oceanbase kyle.sj@oceanbase.com @DataDog/ecosystems-review
11551158

1159+
/hawkeye_by_neubird/ @DataDog/ecosystems-review
11561160
/zilliz_cloud_zilliz_cloud/ @DataDog/ecosystems-review
11571161
/appomni/ @DataDog/ecosystems-review
1162+
/gatling_enterprise/ @DataDog/ecosystems-review
11581163

11591164
/downdetector/ @DataDog/ecosystems-review
11601165

11611166
/chainguard/ @DataDog/ecosystems-review
11621167

11631168
/authzed_cloud/ @DataDog/ecosystems-review
1169+
/akamas/ @DataDog/ecosystems-review
11641170

11651171
# LEAVE THE FOLLOWING LOG OWNERSHIP LAST IN THE FILE
11661172
# Make sure logs team is the full owner for all logs related files

.github/workflows/master.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ jobs:
1414
# Options
1515
standard: true
1616
secrets: inherit
17+
permissions:
18+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
19+
id-token: write
20+
# needed for compute-matrix in test-target.yml
21+
contents: read
1722

1823
publish-test-results:
1924
needs:

.github/workflows/pr.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ jobs:
1818
repo: extras
1919
python-version: "3.12"
2020
secrets: inherit
21+
permissions:
22+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
23+
id-token: write
24+
# needed for compute-matrix in test-target.yml
25+
contents: read

.github/workflows/test-agent.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,8 @@ jobs:
4949
agent-image-windows: "${{ inputs.agent-image-windows }}"
5050
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
5151
secrets: inherit
52+
permissions:
53+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
54+
id-token: write
55+
# needed for compute-matrix in test-target.yml
56+
contents: read

.github/workflows/test-all.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,25 @@ jobs:
10941094
test-py3: ${{ inputs.test-py3 }}
10951095
setup-env-vars: "${{ inputs.setup-env-vars }}"
10961096
secrets: inherit
1097+
j09df637:
1098+
uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
1099+
with:
1100+
job-name: Resilience4j
1101+
target: resilience4j
1102+
platform: linux
1103+
runner: '["ubuntu-22.04"]'
1104+
repo: "${{ inputs.repo }}"
1105+
python-version: "${{ inputs.python-version }}"
1106+
standard: ${{ inputs.standard }}
1107+
latest: ${{ inputs.latest }}
1108+
agent-image: "${{ inputs.agent-image }}"
1109+
agent-image-py2: "${{ inputs.agent-image-py2 }}"
1110+
agent-image-windows: "${{ inputs.agent-image-windows }}"
1111+
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
1112+
test-py2: ${{ inputs.test-py2 }}
1113+
test-py3: ${{ inputs.test-py3 }}
1114+
setup-env-vars: "${{ inputs.setup-env-vars }}"
1115+
secrets: inherit
10971116
jc5ec7c0:
10981117
uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
10991118
with:

.github/workflows/validate.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
# Validations
2020
ci: true
2121
config: true
22-
dashboards: true
2322
imports: true
2423
integration-style: true
2524
jmx-metrics: true
@@ -28,7 +27,5 @@ jobs:
2827
models: true
2928
package: true
3029
readmes: true
31-
saved-views: true
32-
service-checks: true
3330
codeowners: true
3431
secrets: inherit

.in-toto/tag.97d0579e.link

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

adaptive_shield/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ With the Adaptive Shield integration, you can track and monitor SaaS posture ale
1515

1616
When you uninstall this integration, any previous authorizations are revoked.
1717

18-
Additionally, ensure that all API keys associated with this integration have been disabled by searching for the integration name on the [API Keys management page](/organization-settings/api-keys?filter=Adaptive%20Shield).
18+
Additionally, ensure that all API keys associated with this integration have been disabled by searching for the integration name on the [API Keys management page][3].
1919

2020

2121
## Support
2222
Need help? Contact [Adaptive Shield support][2].
2323

2424
[1]: https://dashboard.adaptive-shield.com/settings/alerts/add/63230b73c9624b93dadf38d4
2525
[2]: mailto:support@adaptive-shield.com
26+
[3]: /organization-settings/api-keys?filter=Adaptive%20Shield

akamas/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# CHANGELOG - Akamas
2+
3+
## 1.0.0 / 2025-05-30
4+
5+
_**Added**_:
6+
7+
* Initial Release

0 commit comments

Comments
 (0)