Skip to content

Addressing PR comments for - https://github.com/microsoft/Docker-Provider/pull/568 #569

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 29 commits into from
Jun 1, 2021
Merged

Addressing PR comments for - https://github.com/microsoft/Docker-Provider/pull/568 #569

Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
df13606
full switch to mdsd, upgrade to ruby v1 & omsagent removal
ganga1980 May 14, 2021
9edf933
add odsdirect as fallback option
ganga1980 May 14, 2021
bbecc2c
cleanup
ganga1980 May 14, 2021
836331a
cleanup
ganga1980 May 14, 2021
0178310
move customRegion to stage3
ganga1980 May 14, 2021
f29ec25
updates related to containerlog route
ganga1980 May 15, 2021
f3fbf3c
make xml eventschema consistent
ganga1980 May 15, 2021
673807f
add buffer settings
ganga1980 May 17, 2021
877ae9e
address HTTPServerException deprecation in ruby 2.6
ganga1980 May 17, 2021
90e9eeb
update to official mdsd version
ganga1980 May 17, 2021
5f4707f
merge with ganga's branch - gangams/aad-stage2-full-switch-to-mdsd
rashmichandrashekar May 17, 2021
7ecdbab
fix log message issue
ganga1980 May 17, 2021
90240af
fixes
rashmichandrashekar May 19, 2021
5cd47d7
fix pr feedback
ganga1980 May 19, 2021
a4dff09
get ridoff unused code from omscommon
ganga1980 May 19, 2021
2c8afa4
fix pr feedback
ganga1980 May 19, 2021
7b94989
fix pr feedback
ganga1980 May 19, 2021
1e148d1
merge ci_dev latest changes
ganga1980 May 19, 2021
b2fb9d8
clean up
ganga1980 May 19, 2021
a1c7658
clean up
ganga1980 May 19, 2021
df4898a
Merge branch 'ci_dev' into gangams/aad-stage2-full-switch-to-mdsd
ganga1980 May 19, 2021
d1de167
fix missing conf
ganga1980 May 20, 2021
8d5e61d
ai auth env
rashmichandrashekar May 21, 2021
0c3cf8c
merging with Ganga's latesstnges
rashmichandrashekar May 21, 2021
1e0795e
remove error
rashmichandrashekar May 24, 2021
5c56058
merging with ci_dev
rashmichandrashekar May 25, 2021
553465b
remove mdm metric emit
rashmichandrashekar May 27, 2021
502c5ba
Merge branch 'ci_dev' into rashmi/win-mdm-phase2-no-aad
rashmichandrashekar May 27, 2021
021a586
changes
rashmichandrashekar May 27, 2021
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
12 changes: 6 additions & 6 deletions source/plugins/ruby/ApplicationInsightsUtility.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@ def initializeUtility()

def getContainerRuntimeInfo()
begin
# Not doing this for windows since docker is being deprecated soon and we dont want to bring in the socket dependency.
if !@@isWindows.nil? && @@isWindows == false
containerRuntime = ENV[@@EnvContainerRuntime]
if !containerRuntime.nil? && !containerRuntime.empty?
# DockerVersion field holds either containerRuntime for non-docker or Dockerversion if its docker
@@CustomProperties["DockerVersion"] = containerRuntime
containerRuntime = ENV[@@EnvContainerRuntime]
if !containerRuntime.nil? && !containerRuntime.empty?
# DockerVersion field holds either containerRuntime for non-docker or Dockerversion if its docker
@@CustomProperties["DockerVersion"] = containerRuntime
# Not doing this for windows since docker is being deprecated soon and we dont want to bring in the socket dependency.
if !@@isWindows.nil? && @@isWindows == false
if containerRuntime.casecmp("docker") == 0
dockerInfo = DockerApiClient.dockerInfo
if (!dockerInfo.nil? && !dockerInfo.empty?)
Expand Down