Skip to content

Commit 0aab23d

Browse files
committed
fix possible issues
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 5d89809 commit 0aab23d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

loganalytics/prober.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ func (p *LogAnalyticsProber) translateWorkspaceIntoConfig(val string) WorkspaceC
159159
Labels: map[string]string{},
160160
}
161161

162+
val = strings.TrimSpace(val)
163+
162164
if strings.HasPrefix(val, "/subscriptions/") {
163165
workspaceResource, err := p.ServiceDiscovery.GetWorkspace(p.ctx, val)
164166
if err != nil {
@@ -169,9 +171,9 @@ func (p *LogAnalyticsProber) translateWorkspaceIntoConfig(val string) WorkspaceC
169171
workspaceConfig.CustomerID = to.String(workspaceResource.Properties.CustomerID)
170172

171173
if resourceInfo, err := armclient.ParseResourceId(workspaceConfig.ResourceID); err == nil {
172-
workspaceConfig.Labels["resourceID"] = workspaceConfig.ResourceID
173-
workspaceConfig.Labels["resourceGroup"] = resourceInfo.ResourceGroup
174-
workspaceConfig.Labels["resourceName"] = resourceInfo.ResourceName
174+
workspaceConfig.Labels["workspaceResourceID"] = workspaceConfig.ResourceID
175+
workspaceConfig.Labels["workspaceResourceGroup"] = resourceInfo.ResourceGroup
176+
workspaceConfig.Labels["workspaceResourceName"] = resourceInfo.ResourceName
175177

176178
// add custom labels
177179
workspaceConfig.Labels = p.tagManagerConfig.AddResourceTagsToPrometheusLabels(
@@ -507,8 +509,10 @@ func (p *LogAnalyticsProber) sendQueryToSingleWorkspace(logger *zap.SugaredLogge
507509
metric[num].Labels["workspaceID"] = workspaceConfig.CustomerID
508510

509511
// add labels from resource config
510-
for labelName, labelValue := range workspaceConfig.Labels {
511-
metric[num].Labels[labelName] = labelValue
512+
if workspaceConfig.Labels != nil {
513+
for labelName, labelValue := range workspaceConfig.Labels {
514+
metric[num].Labels[labelName] = labelValue
515+
}
512516
}
513517
}
514518

0 commit comments

Comments
 (0)