Skip to content

Commit 27cd274

Browse files
mphaniasmphanias
committed
Merge branch 'aerospike-agent-and-dashboards' of github.com:mphanias/aerospike-datadog-integrations-core into aerospike-agent-and-dashboards
2 parents 6a8871d + fa2ca7e commit 27cd274

Some content is hidden

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

59 files changed

+4085
-35
lines changed

‎.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,11 @@ plaid/assets/logs/ @DataDog/saa
538538
/kaspersky/manifest.json @DataDog/agent-integrations @DataDog/documentation
539539
/kaspersky/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
540540

541+
/dnsfilter/ @DataDog/saas-integrations
542+
/dnsfilter/*.md @DataDog/saas-integrations @DataDog/documentation
543+
/dnsfilter/manifest.json @DataDog/saas-integrations @DataDog/documentation
544+
/dnsfilter/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
545+
541546
# To keep Security up-to-date with changes to the signing tool.
542547
/datadog_checks_dev/datadog_checks/dev/tooling/signing.py @DataDog/agent-integrations
543548
# As well as the secure downloader.

‎.github/workflows/config/labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ integration/directory:
181181
- directory/**/*
182182
integration/disk:
183183
- disk/**/*
184+
integration/dnsfilter:
185+
- dnsfilter/**/*
184186
integration/dns_check:
185187
- dns_check/**/*
186188
integration/docker_daemon:

‎.github/workflows/measure-disk-usage.yml

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
name: Measure Disk Usage
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
env:
8+
PYTHON_VERSION: "3.12"
9+
10+
jobs:
11+
measure-disk-usage:
12+
runs-on: ubuntu-22.04
13+
steps:
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
with:
16+
fetch-depth: 0
17+
- name: Set up Python ${{ env.PYTHON_VERSION }}
18+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
19+
with:
20+
python-version: ${{ env.PYTHON_VERSION }}
21+
- name: Install ddev
22+
run: |
23+
pip install -e ./datadog_checks_dev[cli]
24+
pip install -e ./ddev
25+
26+
- name: Configure ddev
27+
run: |
28+
ddev config set repos.core .
29+
ddev config set repo core
30+
- name: Measure disk usage (uncompressed)
31+
run: |
32+
mkdir -p status_visualizations
33+
ddev size status --csv > size-uncompressed.csv
34+
ddev size status --save_to_png_path status_visualizations/uncompressed.png > size-uncompressed.txt
35+
cat size-uncompressed.txt
36+
echo "# Size (uncompressed)" >> $GITHUB_STEP_SUMMARY
37+
echo '```' >> $GITHUB_STEP_SUMMARY
38+
cat size-uncompressed.txt >> $GITHUB_STEP_SUMMARY
39+
echo '```' >> $GITHUB_STEP_SUMMARY
40+
41+
- name: Measure disk usage (compressed)
42+
run: |
43+
mkdir -p status_visualizations
44+
ddev size status --csv --compressed > size-compressed.csv
45+
ddev size status --compressed --save_to_png_path status_visualizations/compressed.png > size-compressed.txt
46+
cat size-compressed.txt
47+
echo "# Size (compressed)" >> $GITHUB_STEP_SUMMARY
48+
echo '```' >> $GITHUB_STEP_SUMMARY
49+
cat size-compressed.txt >> $GITHUB_STEP_SUMMARY
50+
echo '```' >> $GITHUB_STEP_SUMMARY
51+
52+
53+
- name: Measure disk usage differences from last commit (uncompressed)
54+
if: false # Disabled for now: size difference can be misleading due to dependencies not being built in the same PR
55+
run: |
56+
mkdir -p diff_visualizations
57+
BEFORE=$(git rev-parse HEAD^)
58+
AFTER=$(git rev-parse HEAD)
59+
ddev size diff $BEFORE $AFTER --csv > diff-uncompressed.csv
60+
ddev size diff $BEFORE $AFTER --save_to_png_path diff_visualizations/diff-uncompressed-linux.png > diff-uncompressed.txt
61+
cat diff-uncompressed.txt
62+
echo "# Size diff (uncompressed)" >> $GITHUB_STEP_SUMMARY
63+
echo '```' >> $GITHUB_STEP_SUMMARY
64+
cat diff-uncompressed.txt >> $GITHUB_STEP_SUMMARY
65+
echo '```' >> $GITHUB_STEP_SUMMARY
66+
67+
- name: Measure disk usage differences from last commit (compressed)
68+
if: false # Disabled for now: size difference can be misleading due to dependencies not being built in the same PR
69+
run: |
70+
mkdir -p diff_visualizations
71+
BEFORE=$(git rev-parse HEAD^)
72+
AFTER=$(git rev-parse HEAD)
73+
ddev size diff $BEFORE $AFTER --compressed --csv > diff-compressed.csv
74+
ddev size diff $BEFORE $AFTER --compressed --save_to_png_path diff_visualizations/diff-compressed-linux.png > diff-compressed.txt
75+
cat diff-compressed.txt
76+
echo "# Size diff (compressed)" >> $GITHUB_STEP_SUMMARY
77+
echo '```' >> $GITHUB_STEP_SUMMARY
78+
cat diff-compressed.txt >> $GITHUB_STEP_SUMMARY
79+
echo '```' >> $GITHUB_STEP_SUMMARY
80+
81+
- name: Upload file sizes (uncompressed)
82+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
83+
with:
84+
name: size-uncompressed.csv
85+
path: size-uncompressed.csv
86+
if-no-files-found: error
87+
88+
- name: Upload file sizes (compressed)
89+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
90+
with:
91+
name: size-compressed.csv
92+
path: size-compressed.csv
93+
if-no-files-found: error
94+
95+
- name: Upload file sizes diff (uncompressed)
96+
if: false # Disabled for now: size difference can be misleading due to dependencies not being built in the same PR
97+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
98+
with:
99+
name: diff-uncompressed.csv
100+
path: diff-uncompressed.csv
101+
if-no-files-found: error
102+
103+
- name: Upload file sizes diff (compressed)
104+
if: false # Disabled for now: size difference can be misleading due to dependencies not being built in the same PR
105+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
106+
with:
107+
name: diff-compressed.csv
108+
path: diff-compressed.csv
109+
if-no-files-found: error
110+
111+
- name: Upload status PNGs
112+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
113+
with:
114+
name: size-visuals
115+
path: status_visualizations/
116+
if-no-files-found: error
117+
118+
- name: Upload diff PNGs
119+
if: false # Disabled for now: size difference can be misleading due to dependencies not being built in the same PR
120+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
121+
with:
122+
name: diff-visuals
123+
path: diff_visualizations/
124+
if-no-files-found: error
125+

‎.github/workflows/slapr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ jobs:
2727
SLAPR_EMOJI_APPROVED: "approved2"
2828
SLAPR_EMOJI_CHANGES_REQUESTED: "changes_requested"
2929
SLAPR_EMOJI_MERGED: "merged"
30-
SLAPR_EMOJI_CLOSED: "closed"
30+
SLAPR_EMOJI_CLOSED: "closed"

‎AGENT_CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
## Datadog Agent version [7.66.0](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7660)
2+
3+
* Active Directory [4.2.0](https://github.com/DataDog/integrations-core/blob/master/active_directory/CHANGELOG.md)
4+
* Amazon Kafka [6.5.0](https://github.com/DataDog/integrations-core/blob/master/amazon_msk/CHANGELOG.md)
5+
* ASP.NET [4.2.0](https://github.com/DataDog/integrations-core/blob/master/aspdotnet/CHANGELOG.md)
6+
* Celery [1.0.0](https://github.com/DataDog/integrations-core/blob/master/celery/CHANGELOG.md)
7+
* Datadog Checks Base [37.10.0](https://github.com/DataDog/integrations-core/blob/master/datadog_checks_base/CHANGELOG.md)
8+
* Cisco ACI [4.5.0](https://github.com/DataDog/integrations-core/blob/master/cisco_aci/CHANGELOG.md)
9+
* Citrix Hypervisor [5.1.1](https://github.com/DataDog/integrations-core/blob/master/citrix_hypervisor/CHANGELOG.md)
10+
* Disk [7.1.0](https://github.com/DataDog/integrations-core/blob/master/disk/CHANGELOG.md)
11+
* .NET CLR [4.2.0](https://github.com/DataDog/integrations-core/blob/master/dotnetclr/CHANGELOG.md)
12+
* Elasticsearch [8.2.0](https://github.com/DataDog/integrations-core/blob/master/elastic/CHANGELOG.md)
13+
* ESXi [3.0.1](https://github.com/DataDog/integrations-core/blob/master/esxi/CHANGELOG.md)
14+
* Exchange Server [4.2.0](https://github.com/DataDog/integrations-core/blob/master/exchange_server/CHANGELOG.md)
15+
* FoundationDB [3.2.1](https://github.com/DataDog/integrations-core/blob/master/foundationdb/CHANGELOG.md)
16+
* Gunicorn [4.1.0](https://github.com/DataDog/integrations-core/blob/master/gunicorn/CHANGELOG.md)
17+
* HTTP [11.3.0](https://github.com/DataDog/integrations-core/blob/master/http_check/CHANGELOG.md)
18+
* IBM MQ [8.2.0](https://github.com/DataDog/integrations-core/blob/master/ibm_mq/CHANGELOG.md)
19+
* IIS [5.2.0](https://github.com/DataDog/integrations-core/blob/master/iis/CHANGELOG.md)
20+
* Infiniband [1.1.0](https://github.com/DataDog/integrations-core/blob/master/infiniband/CHANGELOG.md)
21+
* MongoDB [9.1.0](https://github.com/DataDog/integrations-core/blob/master/mongo/CHANGELOG.md)
22+
* MySQL [15.4.0](https://github.com/DataDog/integrations-core/blob/master/mysql/CHANGELOG.md) **BREAKING CHANGE**
23+
* OpenStack Controller [8.4.0](https://github.com/DataDog/integrations-core/blob/master/openstack_controller/CHANGELOG.md)
24+
* PDH [4.2.0](https://github.com/DataDog/integrations-core/blob/master/pdh_check/CHANGELOG.md)
25+
* Postgres [22.12.1](https://github.com/DataDog/integrations-core/blob/master/postgres/CHANGELOG.md)
26+
* RabbitMQ [7.2.0](https://github.com/DataDog/integrations-core/blob/master/rabbitmq/CHANGELOG.md)
27+
* RiakCS [4.4.0](https://github.com/DataDog/integrations-core/blob/master/riakcs/CHANGELOG.md)
28+
* SNMP [10.0.0](https://github.com/DataDog/integrations-core/blob/master/snmp/CHANGELOG.md)
29+
* Snowflake [7.5.0](https://github.com/DataDog/integrations-core/blob/master/snowflake/CHANGELOG.md)
30+
* SQL Server [22.3.1](https://github.com/DataDog/integrations-core/blob/master/sqlserver/CHANGELOG.md)
31+
* SSH [4.2.1](https://github.com/DataDog/integrations-core/blob/master/ssh_check/CHANGELOG.md)
32+
* TLS [4.4.0](https://github.com/DataDog/integrations-core/blob/master/tls/CHANGELOG.md)
33+
* vSphere [8.3.0](https://github.com/DataDog/integrations-core/blob/master/vsphere/CHANGELOG.md)
34+
* Windows Event Log [5.2.0](https://github.com/DataDog/integrations-core/blob/master/win32_event_log/CHANGELOG.md)
35+
* Windows Service [6.2.0](https://github.com/DataDog/integrations-core/blob/master/windows_service/CHANGELOG.md)
36+
* WMI [3.2.0](https://github.com/DataDog/integrations-core/blob/master/wmi_check/CHANGELOG.md)
37+
138
## Datadog Agent version [7.65.2](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7652)
239

340
* There were no integration updates for this version of the Agent.

0 commit comments

Comments
 (0)