Skip to content

CAdvisor secure port changes #320

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.

Sign up for GitHub

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

Merged
rashmichandrashekar merged 3 commits into from
Jan 3, 2020
+44 −11
Merged

CAdvisor secure port changes #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbcefea
cadvsior secure port changes
Jan 3, 2020
c7fda39
update to use secure/insecure port for cadvisor
Jan 3, 2020
8a6a503
telemetry changes
Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer/conf/telegraf.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
[[inputs.prometheus]]
name_prefix="container.azm.ms/"
## An array of urls to scrape metrics from.
urls = ["http://$NODE_IP:10255/metrics"]
urls = ["$CADVISOR_METRICS_URL"]
fieldpass = ["kubelet_docker_operations", "kubelet_docker_operations_errors"]

metric_version = 2
Expand Down
53 changes: 43 additions & 10 deletions source/code/plugin/CAdvisorMetricsAPIClient.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# frozen_string_literal: true

class CAdvisorMetricsAPIClient
require 'yajl/json_gem'
require "yajl/json_gem"
require "logger"
require "net/http"
require "net/https"
Expand All @@ -29,6 +29,8 @@ class CAdvisorMetricsAPIClient
@dsPromFieldDropCount = ENV["TELEMETRY_DS_PROM_FIELDDROP_LENGTH"]
@dsPromUrlCount = ENV["TELEMETRY_DS_PROM_URLS_LENGTH"]

@cAdvisorMetricsSecurePort = ENV["IS_SECURE_CADVISOR_PORT"]

@LogPath = "/var/opt/microsoft/docker-cimprov/log/kubernetes_perf_log.txt"
@Log = Logger.new(@LogPath, 2, 10 * 1048576) #keep last 2 files, max log file size = 10M
# @@rxBytesLast = nil
Expand Down Expand Up @@ -63,13 +65,33 @@ def getSummaryStatsFromCAdvisor(winNode)
response = nil
@Log.info "Getting CAdvisor Uri"
begin
cAdvisorUri = getCAdvisorUri(winNode)
cAdvisorSecurePort = true
# Check to see if omsagent needs to use 10255(insecure) port or 10250(secure) port
if @cAdvisorMetricsSecurePort && @cAdvisorMetricsSecurePort.value == false
cAdvisorSecurePort = false
else

cAdvisorUri = getCAdvisorUri(winNode, cAdvisorSecurePort)
bearerToken = File.read("/var/run/secrets/kubernetes.io/serviceaccount/token")

if !cAdvisorUri.nil?
uri = URI.parse(cAdvisorUri)
Net::HTTP.start(uri.host, uri.port, :use_ssl => false, :open_timeout => 20, :read_timeout => 40 ) do |http|
cAdvisorApiRequest = Net::HTTP::Get.new(uri.request_uri)
response = http.request(cAdvisorApiRequest)
@Log.info "Got response code #{response.code} from #{uri.request_uri}"
if cAdvisorSecurePort
Net::HTTP.start(uri.host, uri.port,
:use_ssl => true, :open_timeout => 20, :read_timeout => 40,
:ca_file => "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
:verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
cAdvisorApiRequest = Net::HTTP::Get.new(uri.request_uri)
cAdvisorApiRequest["Authorization"] = "Bearer #{bearerToken}"
response = http.request(cAdvisorApiRequest)
@Log.info "Got response code #{response.code} from #{uri.request_uri}"
end
else
Net::HTTP.start(uri.host, uri.port, :use_ssl => false, :open_timeout => 20, :read_timeout => 40) do |http|
cAdvisorApiRequest = Net::HTTP::Get.new(uri.request_uri)
response = http.request(cAdvisorApiRequest)
@Log.info "Got response code #{response.code} from #{uri.request_uri}"
end
end
end
rescue => error
Expand All @@ -81,9 +103,14 @@ def getSummaryStatsFromCAdvisor(winNode)
return response
end

def getCAdvisorUri(winNode)
def getCAdvisorUri(winNode, cAdvisorSecurePort)
begin
defaultHost = "http://localhost:10255"
if cAdvisorSecurePort
defaultHost = "https://localhost:10250"
else
defaultHost = "http://localhost:10255"
end

relativeUri = "/stats/summary"
if !winNode.nil?
nodeIP = winNode["InternalIP"]
Expand All @@ -92,7 +119,11 @@ def getCAdvisorUri(winNode)
end
if !nodeIP.nil?
@Log.info("Using #{nodeIP + relativeUri} for CAdvisor Uri")
return "http://#{nodeIP}:10255" + relativeUri
if cAdvisorSecurePort
return "https://#{nodeIP}:10250" + relativeUri
else
return "http://#{nodeIP}:10255" + relativeUri
end
else
@Log.warn ("NODE_IP environment variable not set. Using default as : #{defaultHost + relativeUri} ")
if !winNode.nil?
Expand All @@ -104,7 +135,7 @@ def getCAdvisorUri(winNode)
end
end

def getMetrics(winNode: nil, metricTime: Time.now.utc.iso8601 )
def getMetrics(winNode: nil, metricTime: Time.now.utc.iso8601)
metricDataItems = []
begin
cAdvisorStats = getSummaryStatsFromCAdvisor(winNode)
Expand Down Expand Up @@ -211,6 +242,7 @@ def getContainerCpuMetricItems(metricJSON, hostName, cpuMetricNameToCollect, met
telemetryProps["PodName"] = podName
telemetryProps["ContainerName"] = containerName
telemetryProps["Computer"] = hostName
telemetryProps["CAdvisorIsSecure"] = @cAdvisorMetricsSecurePort
#telemetry about log collections settings
if (File.file?(@configMapMountPath))
telemetryProps["clustercustomsettings"] = true
Expand Down Expand Up @@ -412,6 +444,7 @@ def getContainerMemoryMetricItems(metricJSON, hostName, memoryMetricNameToCollec
telemetryProps["PodName"] = podName
telemetryProps["ContainerName"] = containerName
telemetryProps["Computer"] = hostName
telemetryProps["CAdvisorIsSecure"] = @cAdvisorMetricsSecurePort
ApplicationInsightsUtility.sendMetricTelemetry(metricNametoReturn, metricValue, telemetryProps)
end
end
Expand Down