Skip to content

Commit 33683f9

Browse files
fix: Database_observability: add Azure provider relabeling rules (#5372)
### Brief description of Pull Request Make sure that relabeling rules are applied correctly for Azure CSP config block. ### Pull Request Details <!-- Add a more detailed descripion of the Pull Request here, if needed. --> ### Issue(s) fixed by this Pull Request <!-- Uncomment the following line and fill in an issue number if you want a GitHub issue to be closed automatically when this PR gets merged. --> <!-- Fixes #issue_id --> ### Notes to the Reviewer <!-- Add any relevant notes for the reviewers and testers of this PR. --> ### PR Checklist <!-- Remove items that do not apply. For completed items, change [ ] to [x]. --> - [ ] Documentation added - [x] Tests updated - [ ] Config converters updated
1 parent 2347c1b commit 33683f9

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

internal/component/database_observability/relabeling.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,22 @@ func GetRelabelingRules(serverID string, cp *CloudProvider) []*relabel.Config {
3030
rs = append(rs, &providerName, &providerRegion, &providerAccount)
3131
}
3232
if cp.Azure != nil {
33-
// We only support Azure provider_name for now.
3433
providerName := relabel.DefaultRelabelConfig
3534
providerName.Replacement = "azure"
3635
providerName.TargetLabel = "provider_name"
3736
providerName.Action = relabel.Replace
3837

39-
rs = append(rs, &providerName)
38+
providerRegion := relabel.DefaultRelabelConfig
39+
providerRegion.Replacement = cp.Azure.ResourceGroup
40+
providerRegion.TargetLabel = "provider_region"
41+
providerRegion.Action = relabel.Replace
42+
43+
providerAccount := relabel.DefaultRelabelConfig
44+
providerAccount.Replacement = cp.Azure.SubscriptionID
45+
providerAccount.TargetLabel = "provider_account"
46+
providerAccount.Action = relabel.Replace
47+
48+
rs = append(rs, &providerName, &providerRegion, &providerAccount)
4049
}
4150
}
4251

internal/component/database_observability/relabeling_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,27 @@ func Test_GetRelabelingRules(t *testing.T) {
4949
t.Run("return relabeling rules with Azure config", func(t *testing.T) {
5050
rr := GetRelabelingRules("some-server-id", &CloudProvider{
5151
Azure: &AzureCloudProviderInfo{
52-
ServerName: "some-resource",
52+
ServerName: "some-resource",
53+
ResourceGroup: "some-resource-group",
54+
SubscriptionID: "some-subscription-id",
5355
},
5456
})
5557

56-
require.Equal(t, 2, len(rr))
58+
require.Equal(t, 4, len(rr))
5759
require.Equal(t, "some-server-id", rr[0].Replacement)
5860
require.Equal(t, "server_id", rr[0].TargetLabel)
5961
require.Equal(t, relabel.Replace, rr[0].Action)
6062

6163
require.Equal(t, "azure", rr[1].Replacement)
6264
require.Equal(t, "provider_name", rr[1].TargetLabel)
6365
require.Equal(t, relabel.Replace, rr[1].Action)
66+
67+
require.Equal(t, "some-resource-group", rr[2].Replacement)
68+
require.Equal(t, "provider_region", rr[2].TargetLabel)
69+
require.Equal(t, relabel.Replace, rr[2].Action)
70+
71+
require.Equal(t, "some-subscription-id", rr[3].Replacement)
72+
require.Equal(t, "provider_account", rr[3].TargetLabel)
73+
require.Equal(t, relabel.Replace, rr[3].Action)
6474
})
6575
}

0 commit comments

Comments
 (0)