Skip to content

Commit 7338203

Browse files
mergify[bot]zmoogclaude
authored
[9.3] (backport #12919) Add Azure Monitor receiver to EDOT Collector (#14442)
* Add Azure Monitor receiver to EDOT Collector (#12919) * feat: add Azure Monitor receiver to EDOT Collector Co-authored-by: Cursor <cursoragent@cursor.com> * Fix go fmt * Update README * Update NOTICE*.txt * Update NOTICE* and internal/edot.go.* * Rever docs changes * Merge main and resolve latest conflicts Agent-Logs-Url: https://github.com/elastic/elastic-agent/sessions/9c10abbe-c4f6-4f71-8e8f-6b80af2fc530 Co-authored-by: zmoog <25941+zmoog@users.noreply.github.com> * Revert "Merge main and resolve latest conflicts" This reverts commit 86b586f. Co-authored-by: zmoog <25941+zmoog@users.noreply.github.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: zmoog <25941+zmoog@users.noreply.github.com> (cherry picked from commit fd9699b) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # internal/edot/README.md # internal/edot/go.mod # internal/edot/go.sum # internal/edot/otelcol/components/default.go # internal/pkg/otel/testdata/all-components.yml * Resolve merge conflicts in 9.3 backport of Add Azure Monitor receiver to EDOT Collector - Resolve conflict markers in go.mod, go.sum, default.go, README.md, all-components.yml, NOTICE.txt, NOTICE-fips.txt - Keep HEAD's otel-contrib packages at v0.152.0, add azuremonitorreceiver - Run go mod tidy and mage notice to regenerate derived files Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Maurizio Branca <maurizio.branca@elastic.co> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 398527a commit 7338203

9 files changed

Lines changed: 778 additions & 20 deletions

File tree

NOTICE-fips.txt

Lines changed: 396 additions & 4 deletions
Large diffs are not rendered by default.

NOTICE.txt

Lines changed: 338 additions & 6 deletions
Large diffs are not rendered by default.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
kind: feature
2+
3+
summary: Add Azure Monitor receiver to EDOT Collector.
4+
5+
component: elastic-agent

docs/reference/edot-collector/custom-collector.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,3 @@ Build your custom Collector using the `ocb` tool and the configuration file by r
227227
The command generates a new Collector in the specified output path, `otelcol-dev`. The generated Collector includes the components you specified in the configuration file.
228228

229229
For general information on building a custom Collector, refer to the [OpenTelemetry documentation](https://opentelemetry.io/docs/collector/custom-collector/#step-1---install-the-builder).
230-

internal/edot/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ This section provides a summary of components included in the Elastic Distributi
3737
|---|---|
3838
| [apachereceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/apachereceiver/v0.152.0/receiver/apachereceiver/README.md) | v0.152.0 |
3939
| [awss3receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/awss3receiver/v0.152.0/receiver/awss3receiver/README.md) | v0.152.0 |
40+
| [azuremonitorreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/azuremonitorreceiver/v0.152.0/receiver/azuremonitorreceiver/README.md) | v0.152.0 |
4041
| [dockerstatsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/dockerstatsreceiver/v0.152.0/receiver/dockerstatsreceiver/README.md) | v0.152.0 |
4142
| [elasticapmintakereceiver](https://github.com/elastic/opentelemetry-collector-components/blob/receiver/elasticapmintakereceiver/v0.47.0/receiver/elasticapmintakereceiver/README.md) | v0.47.0 |
4243
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.152.0/receiver/filelogreceiver/README.md) | v0.152.0 |

internal/edot/go.mod

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ require (
3838
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.152.0
3939
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.152.0
4040
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.152.0
41+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver v0.152.0
4142
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.152.0
4243
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.152.0
4344
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.152.0
@@ -71,6 +72,8 @@ require (
7172
require (
7273
cloud.google.com/go/pubsub/v2 v2.0.0 // indirect
7374
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.2 // indirect
75+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3 v3.0.1 // indirect
76+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0 // indirect
7477
github.com/DeRuina/timberjack v1.4.2 // indirect
7578
github.com/Masterminds/semver/v3 v3.5.0 // indirect
7679
github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e // indirect
@@ -109,6 +112,7 @@ require (
109112
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
110113
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 // indirect
111114
github.com/gosnmp/gosnmp v1.43.2 // indirect
115+
github.com/huandu/go-clone v1.7.3 // indirect
112116
github.com/insomniacslk/dhcp v0.0.0-20251020182700-175e84fbb167 // indirect
113117
github.com/itchyny/timefmt-go v0.1.8 // indirect
114118
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -122,6 +126,7 @@ require (
122126
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.152.0 // indirect
123127
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.152.0 // indirect
124128
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/xstreamencoding v0.152.0 // indirect
129+
github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
125130
github.com/oschwald/geoip2-golang/v2 v2.1.0 // indirect
126131
github.com/oschwald/maxminddb-golang/v2 v2.1.1 // indirect
127132
github.com/osquery/osquery-go v0.0.0-20260226222546-0cc22f415e57 // indirect
@@ -215,10 +220,10 @@ require (
215220
github.com/Azure/azure-event-hubs-go/v3 v3.6.1 // indirect
216221
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
217222
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
218-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
223+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1 // indirect
219224
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
220-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
221-
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.1.0 // indirect
225+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect
226+
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.3.0 // indirect
222227
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
223228
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0 // indirect
224229
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.8.0 // indirect

internal/edot/go.sum

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVt
5858
github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
5959
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
6060
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
61-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
62-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
61+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1 h1:jHb/wfvRikGdxMXYV3QG/SzUOPYN9KEUUuC0Yd0/vC0=
62+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1/go.mod h1:pzBXCYn05zvYIrwLgtK8Ap8QcjRg+0i76tMQdWN6wOk=
6363
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
6464
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
6565
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
6666
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
67-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
68-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
67+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 h1:fhqpLE3UEXi9lPaBRpQ6XuRW0nU7hgg4zlmZZa+a9q4=
68+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0/go.mod h1:7dCRMLwisfRH3dBupKeNCioWYUZ4SS09Z14H+7i8ZoY=
6969
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.2 h1:EBiOwZYJUMsjLGJ9x0oNY6ADf+5915P/jhhVcn42KXc=
7070
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.2/go.mod h1:NjuxmUsBJ0Ya9Xxjhjo06bj3/QB4C8z838I5S88UtQQ=
71-
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.1.0 h1:X/C/tY3dxwsuFnSNArmTWKr0O6P59SRY6VsUcIkefEw=
72-
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.1.0/go.mod h1:wCAGp7Xm35A5laB8z8yK9p/kU8OEBFuTvUm4eKCzr/M=
71+
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.3.0 h1:blbWEpcsg2EFqXe64sRPdWPKnLWm0fPY4iHyo4MoHVM=
72+
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.3.0/go.mod h1:jWOswzu+YEJ01Csz2ZUir7KecMjHJNYwxufLqAYi+ls=
7373
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 h1:LkHbJbgF3YyvC53aqYGR+wWQDn2Rdp9AQdGndf9QvY4=
7474
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0/go.mod h1:QyiQdW4f4/BIfB8ZutZ2s+28RAgfa/pT+zS++ZHyM1I=
7575
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.8.0 h1:0nGmzwBv5ougvzfGPCO2ljFRHvun57KpNrVCMrlk0ns=
@@ -80,14 +80,22 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.
8080
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0/go.mod h1:TSH7DcFItwAufy0Lz+Ft2cyopExCpxbOxI5SkH4dRNo=
8181
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do=
8282
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0/go.mod h1:LRr2FzBTQlONPPa5HREE5+RjSCTXl7BwOvYOaWTqCaI=
83+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v3 v3.1.1 h1:1kpY4qe+BGAH2ykv4baVSqyx+AY5VjXeJ15SldlU6hs=
84+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v3 v3.1.1/go.mod h1:nT6cWpWdUt+g81yuKmjeYPUtI73Ak3yQIT4PVVsCEEQ=
8385
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0 h1:pPvTJ1dY0sA35JOeFq6TsY2xj6Z85Yo23Pj4wCCvu4o=
8486
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.0.0/go.mod h1:mLfWfj8v3jfWKsL9G4eoBoXVcsqcIUTapmdKy7uGOp0=
8587
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 h1:Ds0KRF8ggpEGg4Vo42oX1cIt/IfOhHWJBikksZbVxeg=
8688
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0/go.mod h1:jj6P8ybImR+5topJ+eH6fgcemSFBmU6/6bFF8KkwuDI=
8789
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 h1:bXwSugBiSbgtz7rOtbfGf+woewp4f06orW9OP5BjHLA=
8890
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0/go.mod h1:Y/HgrePTmGy9HjdSGTqZNa+apUpTVIEVKXJyARP2lrk=
91+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeployments v0.2.0 h1:bYq3jfB2x36hslKMHyge3+esWzROtJNk/4dCjsKlrl4=
92+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeployments v0.2.0/go.mod h1:fewgRjNVE84QVVh798sIMFb7gPXPp7NmnekGnboSnXk=
8993
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 h1:Dd+RhdJn0OTtVGaeDLZpcumkIVCtA/3/Fo42+eoYvVM=
9094
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0/go.mod h1:5kakwfW5CjC9KK+Q4wjXAg+ShuIm2mBMua0ZFj2C8PE=
95+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3 v3.0.1 h1:guyQA4b8XB2sbJZXzUnOF9mn0WDBv/ZT7me9wTipKtE=
96+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3 v3.0.1/go.mod h1:8h8yhzh9o+0HeSIhUxYny+rEQajScrfIpNktvgYG3Q8=
97+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0 h1:wxQx2Bt4xzPIKvW59WQf1tJNx/ZZKPfN+EhPX3Z6CYY=
98+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0/go.mod h1:TpiwjwnW/khS0LKs4vW5UmmT9OWcxaveS8U7+tlknzo=
9199
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
92100
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
93101
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
@@ -897,6 +905,10 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq
897905
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
898906
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
899907
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
908+
github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c=
909+
github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
910+
github.com/huandu/go-clone v1.7.3 h1:rtQODA+ABThEn6J5LBTppJfKmZy/FwfpMUWa8d01TTQ=
911+
github.com/huandu/go-clone v1.7.3/go.mod h1:ReGivhG6op3GYr+UY3lS6mxjKp7MIGTknuU5TbTVaXE=
900912
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
901913
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
902914
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
@@ -1297,6 +1309,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceive
12971309
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.152.0/go.mod h1:Q+rUYZQcarsh1ckZqp21v0Ygf4ARgFDmx78xRuJUtvY=
12981310
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.152.0 h1:/Gey6T9eodIBtOhvq0Rj5jQQXX45xKEF88j0jUgv+P0=
12991311
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver v0.152.0/go.mod h1:CvCHfHilR729ORvhDa0xXwrKHuxbPyQgzpSmFSLEEsY=
1312+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver v0.152.0 h1:pVDHBMqPVNbDN4A48MKkn+snUI8sfBFjL472m2nZqUI=
1313+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver v0.152.0/go.mod h1:zAAGmG91bYMzviozh2RFrIWprSosUTAUzz7myR4DQQc=
13001314
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.152.0 h1:rCLQPcZV2ndTuufFrBsqWITty9L5UMer8Gs28ovudb4=
13011315
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.152.0/go.mod h1:v2SPq9zDKrcxJwGX+PD3WQjhTNRGwSGqgY3LMtfj6iE=
13021316
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.152.0 h1:F/Yn80bPI+H47MpZfcEjRkFVL9w9S8kv037DcZOkL3M=
@@ -1360,6 +1374,8 @@ github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W
13601374
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
13611375
github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
13621376
github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
1377+
github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
1378+
github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
13631379
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
13641380
github.com/oschwald/geoip2-golang/v2 v2.1.0 h1:DjnLhNJu9WHwTrmoiQFvgmyJoczhdnm7LB23UBI2Amo=
13651381
github.com/oschwald/geoip2-golang/v2 v2.1.0/go.mod h1:qdVmcPgrTJ4q2eP9tHq/yldMTdp2VMr33uVdFbHBiBc=

internal/edot/otelcol/components/default.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
// Receivers:
2222
apachereceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"
2323
awss3receiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver"
24+
azuremonitorreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver"
2425
dockerstatsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver"
2526
filelogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver" // for collecting log files
2627
hostmetricsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver"
@@ -152,6 +153,7 @@ func Default(extensionFactories ...extension.Factory) func() (otelcol.Factories,
152153

153154
nopreceiver.NewFactory(),
154155
apachereceiver.NewFactory(),
156+
azuremonitorreceiver.NewFactory(),
155157
iisreceiver.NewFactory(),
156158
mysqlreceiver.NewFactory(),
157159
postgresqlreceiver.NewFactory(),

internal/pkg/otel/testdata/all-components.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ receivers:
107107
value_type: int
108108
scalar_oids:
109109
- oid: ".1.3.6.1.2.1.1.8.0"
110+
azuremonitor:
111+
subscription_ids:
112+
- 00000000-0000-0000-0000-000000000000
113+
cloud: AzureCloud
114+
credentials: default_credentials
110115

111116
connectors:
112117
spanmetrics:
@@ -205,6 +210,7 @@ service:
205210
- postgresql
206211
- prometheusremotewrite
207212
- snmp
213+
- azuremonitor
208214
- statsd
209215

210216
metrics/aggregated:

0 commit comments

Comments
 (0)