Skip to content

Commit

Permalink
take Kaveesh's windows fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rashmichandrashekar committed Oct 13, 2023
1 parent 4c7530d commit 52fc0a8
Showing 1 changed file with 0 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,6 @@ def populateDefaultPrometheusConfig
contents = contents.gsub("$$NODE_NAME$$", ENV["NODE_NAME"])
File.open(@windowsexporterDefaultDsFile, "w") { |file| file.puts contents }
defaultConfigs.push(@windowsexporterDefaultDsFile)

# If advanced mode is enabled, but not the windows daemonset, scrape windows kubelet from the replicaset as if it's simple mode
elsif isConfigReaderSidecar
UpdateScrapeIntervalConfig(@windowsexporterDefaultRsSimpleFile, windowsexporterScrapeInterval)
if !winexporterMetricsKeepListRegex.nil? && !winexporterMetricsKeepListRegex.empty?
AppendMetricRelabelConfig(@windowsexporterDefaultRsSimpleFile, winexporterMetricsKeepListRegex)
end
defaultConfigs.push(@windowsexporterDefaultRsSimpleFile)
end
end

Expand Down Expand Up @@ -418,14 +410,6 @@ def populateDefaultPrometheusConfig
contents = contents.gsub("$$NODE_NAME$$", ENV["NODE_NAME"])
File.open(@windowskubeproxyDefaultDsFile, "w") { |file| file.puts contents }
defaultConfigs.push(@windowskubeproxyDefaultDsFile)

# If advanced mode is enabled, but not the windows daemonset, scrape windows kubelet from the replicaset as if it's simple mode
elsif isConfigReaderSidecar
UpdateScrapeIntervalConfig(@windowskubeproxyDefaultFileRsSimpleFile, windowskubeproxyScrapeInterval)
if !winkubeproxyMetricsKeepListRegex.nil? && !winkubeproxyMetricsKeepListRegex.empty?
AppendMetricRelabelConfig(@windowskubeproxyDefaultFileRsSimpleFile, winkubeproxyMetricsKeepListRegex)
end
defaultConfigs.push(@windowskubeproxyDefaultFileRsSimpleFile)
end
end

Expand Down

0 comments on commit 52fc0a8

Please sign in to comment.