Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Azure monitor scraper #18898

Merged
merged 14 commits into from
Apr 24, 2023
Merged

Azure monitor scraper #18898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cbe950f
Azure monitor scraper
altuner Feb 15, 2023
1007a12
Added filter for services
altuner Mar 23, 2023
0797e5a
addressing comments
altuner Mar 27, 2023
8b506c6
add new component into dependabot.yml
altuner Apr 4, 2023
ee9c80b
added into templates
altuner Apr 4, 2023
5590ecc
addressing comments
altuner Apr 12, 2023
fd5d36d
updated dependencies
altuner Apr 12, 2023
534a4ab
addressing comments
altuner Apr 14, 2023
3d89916
added golden copy
altuner Apr 15, 2023
f58faea
added dimensions
altuner Apr 18, 2023
cf3497b
comments addressed
altuner Apr 18, 2023
20abc7b
Update receiver/azuremonitorreceiver/README.md
codeboten Apr 19, 2023
9a737c8
update type to azuremonitor
codeboten Apr 21, 2023
a9fa1ba
small fixes
altuner Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
small fixes
  • Loading branch information
@altuner
altuner committed Apr 21, 2023
commit a9fa1ba1305fcfc7dde858d038c0162f12914004
2 changes: 1 addition & 1 deletion receiver/azuremonitorreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func createMetricsReceiver(ctx context.Context, params receiver.CreateSettings,
}

azureScraper := newScraper(cfg, params)
scraper, err := scraperhelper.NewScraper(typeStr, azureScraper.scrape, scraperhelper.WithStart(azureScraper.start))
scraper, err := scraperhelper.NewScraper(metadata.Type, azureScraper.scrape, scraperhelper.WithStart(azureScraper.start))
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/azuremonitorreceiver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestNewFactory(t *testing.T) {
desc: "creates a new factory with correct type",
testFunc: func(t *testing.T) {
factory := NewFactory()
require.EqualValues(t, typeStr, factory.Type())
require.EqualValues(t, metadata.Type, factory.Type())
},
},
{
Expand Down
22 changes: 11 additions & 11 deletions receiver/azuremonitorreceiver/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ func (s *azureScraper) getResourceMetricsValues(ctx context.Context, resourceID

for _, metric := range result.Value {

for _, timeserie := range metric.Timeseries {
if timeserie.Data != nil {
for _, timeserieData := range timeserie.Data {
s.processTimeserieData(resourceID, metric, timeserieData, timeserie.Metadatavalues)
for _, timeseriesElement := range metric.Timeseries {
if timeseriesElement.Data != nil {
for _, metricValue := range timeseriesElement.Data {
s.processTimeseriesData(resourceID, metric, metricValue, timeseriesElement.Metadatavalues)
}
}
}
Expand Down Expand Up @@ -352,10 +352,10 @@ func getResourceMetricsValuesRequestOptions(
return filter
}

func (s *azureScraper) processTimeserieData(
func (s *azureScraper) processTimeseriesData(
resourceID string,
metric *armmonitor.Metric,
timeserieData *armmonitor.MetricValue,
metricValue *armmonitor.MetricValue,
metadataValues []*armmonitor.MetadataValue,
) {
s.mutex.Lock()
Expand All @@ -367,11 +367,11 @@ func (s *azureScraper) processTimeserieData(
name string
value *float64
}{
{"Average", timeserieData.Average},
{"Count", timeserieData.Count},
{"Maximum", timeserieData.Maximum},
{"Minimum", timeserieData.Minimum},
{"Total", timeserieData.Total},
{"Average", metricValue.Average},
{"Count", metricValue.Count},
{"Maximum", metricValue.Maximum},
{"Minimum", metricValue.Minimum},
{"Total", metricValue.Total},
}
for _, aggregation := range aggregationsData {
if aggregation.value != nil {
Expand Down