💚 CLA has been signed

This pull request does not have a backport label. Could you fix it @ClumsyPotato? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /package : Generate the packages and run the E2E tests.

• /beats-tester : Run the installation tests with beats-tester.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

/test

Pinging @elastic/integrations (Team:Integrations)

@ClumsyPotato Thank you so much for your contribution!!

/test

@kaiyan-sheng Glad i can help. I am open for suggestion and changes :)

Can you also make sure that this fix gets backportet to version 7.x? That would be awsome :3

@ClumsyPotato Sorry for the delay on reviewing this PR! Overall it looks good, one nit is seems like there are several lines of code are repeated:

event, metricList = createEvent(timestamp, defaultMetric, resource, groupTimeValues)
if client.Config.AddCloudMetadata {
	vm = client.GetVMForMetaData(&resource, groupTimeValues)
	addCloudVMMetadata(&event, vm, resource.Subscription)
}
if client.Config.DefaultResourceType == "" {
	event.ModuleFields.Put("metrics", metricList)
} else {
	for key, metric := range metricList {
		event.MetricSetFields.Put(key, metric)
	}
}

Could you refactor this a bit please? Also it would be good to run TestData to regenerate data.json sample file to show that multiple dimensions are all collected. If you can add some test maybe in data_test.go, that would be great!
Thanks!!

/test

@kaiyan-sheng thanks for the input. We just moved the whole block into its own function. Hope thats fine now^^
About The integration tests...I did some changes to the test and tried to run the tests with mage IntegTest and GoIntegTest but it did not make any change to data.json
Any idea what could be the problem?

@ClumsyPotato Thanks for the change! What I usually do to regenerate data.json file is: (using compute VM as an example) in azure/compute_vm/compute_vm_integration_test.go, remove //go:build integration && azure and // +build integration,azure. Then add all the environment variables required for testing: AZURE_CLIENT_ID, AZURE_CLIENT_SECRET and etc. Then change the DataFlag to true under metricbeat/mb/testing/flags/flags.go. After that you should be able to see updated data.json when running the TestData function.

This is probably not the right way to run the test but it works 😂

Should be possible to run TestData tests responsible for updating sample data by running, from within the metricset folder:

$ go test --tags integration,azure -data -run "TestData"

Note the -data flag and the tags (integrations is required, azure is required for this particular metricset). I've used this command for the GCP module successfully. -run "TestData" may be omitted, as it's only used to target data tests only.

A note about tags: the -data flag is a custom flag added by metricbeat framework. I will not be present in case tags do not match, as the relevant code will not be run and silently skipped (without the tag the test file is ignored by go compiler so the framework doesn't load). This may happen if there are different tags in the build tags of the metricset under test (i.e. the GCP billing module has also billing tag).

I don't have an Azure environment setup to test this PR right now, but if you can try this command and confirm it works I'll add it to the developer documentation :)

/test

Hey @shelly-yao @endorama
I added a test that makes sure that a certain dimension is always present in the metricset.
Also running the test with the labels added like @endorama describe also works when running inside the monitor directory

/test

Hello @kaiyan-sheng,
I saw that there are backport labels for 7.17.0 and 8.0.0. Will be the bug-fix merged in older versions too? For example 7.13.X and above?

Hey @Patrick-Eichhorn, sorry we won't be able to backport it to 7.13.x because we are not planning to release any new patch release for 7.13 anymore.