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.

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

Register storage_account as second name for storage metricset #28447

Merged
merged 5 commits into from
Oct 15, 2021

Conversation

narph
Copy link
Contributor

@narph narph commented Oct 14, 2021

What does this PR do?

Register storage_account as second name for storage metricset
Conclusion for #28284

Why is it important?

Register storage_account as second name for storage metricset
Conclusion for #28284

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Ex. record:

 "_source" : {
          "@timestamp" : "2021-10-14T15:24:00.000Z",
          "ecs" : {
            "version" : "1.12.0"
          },
          "host" : {
            "os" : {
              "version" : "10.0",
              "family" : "windows",
              "name" : "Windows 10 Pro",
              "kernel" : "10.0.19041.1288 (WinBuild.160101.0800)",
              "build" : "19041.1288",
              "type" : "windows",
              "platform" : "windows"
            },
            "id" : "bc395ab9-1a1a-4312-ad0b-a05cceaf78f1",
            "name" : "DESKTOP-K76UDQL",
            "ip" : [
              "2a02:a446:f25b:1:558d:72b2:74b6:7c67",
              "2a02:a446:f25b:1:50a1:b79:2bba:2ece",
              "fe80::558d:72b2:74b6:7c67",
              "192.168.2.34",
              "fe80::f09a:4481:bc48:e3e3",
              "169.254.227.227",
              "fe80::d135:57b1:9b7f:e10a",
              "169.254.225.10",
              "fe80::6901:1ee0:60dd:c986",
              "169.254.201.134",
              "fe80::fc98:6ed8:6d25:3d98",
              "169.254.61.152",
              "fe80::9cbc:1ebb:76b9:784a",
              "192.168.208.1",
              "fe80::3510:7ca8:de4e:3277",
              "172.23.16.1"
            ],
            "mac" : [
              "cc:48:3a:b9:87:c0",
              "9c:b6:d0:3e:a8:c4",
              "9e:b6:d0:3e:a8:c4",
              "ae:b6:d0:3e:a8:c4",
              "28:c2:1f:52:ff:bf",
              "00:15:5d:de:e2:d2",
              "00:15:5d:63:ae:f8"
            ],
            "hostname" : "DESKTOP-K76UDQL",
            "architecture" : "x86_64"
          },
          "agent" : {
            "version" : "8.0.0",
            "ephemeral_id" : "0a3179f5-f12d-4ece-b072-b2c315989223",
            "id" : "cc86e133-43d5-4170-855d-caa094862aa1",
            "name" : "DESKTOP-K76UDQL",
            "type" : "metricbeat"
          },
          "service" : {
            "type" : "azure"
          },
          "cloud" : {
            "region" : "westeurope",
            "provider" : "azure"
          },
          "event" : {
            "dataset" : "azure.storage_account",
            "module" : "azure",
            "duration" : 34640434800
          },
          "metricset" : {
            "name" : "storage_account",
            "period" : 300000
          },
          "azure" : {
            "subscription_id" : "70bd6e77-4b1e-4835-8896-db77b8eef364",
            "dimensions" : {
              "response_type" : "Success"
            },
            "storage_account" : {
              "transactions" : {
                "total" : 0
              }
            },
            "timegrain" : "PT5M",
            "namespace" : "Microsoft.Storage/storageAccounts",
            "resource" : {
              "type" : "Microsoft.Storage/storageAccounts",
              "group" : "obs-infrastructure",
              "name" : "urcbyscmrkbygsawinvm",
              "id" : "/subscriptions/70bd6e77-4b1e-4835-8896-db77b8eef364/resourceGroups/obs-infrastructure/providers/Microsoft.Storage/storageAccounts/urcbyscmrkbygsawinvm"
            }
          }
        },
        "sort" : [
          1634225040000
        ]
      }

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 14, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 14, 2021

This pull request does not have a backport label. Could you fix it @narph? 🙏
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.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 14, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 14, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-10-15T10:56:28.547+0000

  • Duration: 103 min 48 sec

  • Commit: 87ec850

Test stats 🧪

Test Results
Failed 0
Passed 9549
Skipped 2537
Total 12086

💚 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.

@narph narph requested a review from jsoriano October 15, 2021 09:06
@narph narph self-assigned this Oct 15, 2021
@narph narph added the Team:Integrations Label for the Integrations team label Oct 15, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 15, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@narph narph added backport-v7.16.0 Automated backport with mergify needs_team Indicates that the issue/PR needs a Team:* label labels Oct 15, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 15, 2021
@botelastic
Copy link

botelastic bot commented Oct 15, 2021

This pull request doesn't have a Team:<team> label.

@narph narph removed the backport-skip Skip notification from the automated backport with mergify label Oct 15, 2021
@@ -894,6 +894,7 @@ for a few releases. Please use other tools provided by Elastic to fetch data fro
- Move openmetrics module to oss. {pull}26561[26561]
- Add `gke` metricset collection to `gcp` module {pull}26824[26824]
- Added a new beta `enterprisesearch` module for Elastic Enterprise Search {pull}27549[27549]
- Register additional name for `storage` metricset in the azure module. {pull}28447[28447]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to document this or show some deprecation warning in the old name?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no deprecation, I don't plan to change the name, just want to remove the pipeline in the future

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So are both metricsets going to stay forever in beats?

@narph narph requested a review from jsoriano October 15, 2021 10:56
@@ -894,6 +894,7 @@ for a few releases. Please use other tools provided by Elastic to fetch data fro
- Move openmetrics module to oss. {pull}26561[26561]
- Add `gke` metricset collection to `gcp` module {pull}26824[26824]
- Added a new beta `enterprisesearch` module for Elastic Enterprise Search {pull}27549[27549]
- Register additional name for `storage` metricset in the azure module. {pull}28447[28447]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So are both metricsets going to stay forever in beats?

@narph
Copy link
Contributor Author

narph commented Oct 15, 2021

@jsoriano

So are both metricsets going to stay forever in beats?

Are they considered as 2 metricsets? I assumed it will just be one metricset with 2 registered names. I do not have any close future plans to replace the name and I was thinking that adding the deprecation message in the logs might push some users to move to the new naming but dashboards and docs do not support that.
Do you expect any potential issues here?

@jsoriano
Copy link
Member

So are both metricsets going to stay forever in beats?

Are they considered as 2 metricsets?

This is an almost metaphysical question 😄

I assumed it will just be one metricset with 2 registered names. I do not have any close future plans to replace the name and I was thinking that adding the deprecation message in the logs might push some users to move to the new naming but dashboards and docs do not support that.
Do you expect any potential issues here?

If both names are going to stay by now I don't see any problem. Only that if we plan to remove the old registered name at some point we should warn users. If we don't plan to remove it, all good.

@narph narph merged commit b3991d4 into elastic:master Oct 15, 2021
@narph narph deleted the azure-storage-name branch October 15, 2021 13:28
mergify bot pushed a commit that referenced this pull request Oct 15, 2021
…8447)

* add storage

* changelog

* add fields

(cherry picked from commit b3991d4)
narph added a commit that referenced this pull request Oct 18, 2021
…8447) (#28470)

* add storage

* changelog

* add fields

(cherry picked from commit b3991d4)

Co-authored-by: Mariana Dima <mariana@elastic.co>
v1v added a commit that referenced this pull request Oct 18, 2021
* upstream/7.x:
  chore: use same branching schema for e2e (#28493)
  [Automation] Update elastic stack version to 7.16.0-8bf0b9b1 for testing (#28484)
  chore(ci): remove not used param when triggering e2e tests (#27823) (#27828)
  Add deprecation warning for filebeat disabled modules (#28393)
  Run Python tests in libbeat (#28438) (#28485)
  Register `storage_account` as second name for `storage` metricset  (#28447) (#28470)
  [CI] Add E2E for x-pack/elastic-agent (fleet) (#24112) (#28465)
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.16.0 Automated backport with mergify Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants