Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 1a77f1e

Browse files
swjaiswjai
authored
AUM V1 handling comments (#888)
* AUM V1 handling comments * Update filter_patch_management.rb * Update filter_patch_management.rb * Update Makefile * Update Base_DSC.data
1 parent 816f13f commit 1a77f1e

3 files changed

Lines changed: 24 additions & 15 deletions

File tree

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ providers:
272272
ifeq ($(BUILD_OMS),BUILD_OMS)
273273
nx:
274274
rm -rf output/staging; \
275-
VERSION="1.3"; \
275+
VERSION="1.4"; \
276276
PROVIDERS="nxService nxPackage nxUser nxGroup nxAvailableUpdates"; \
277277
STAGINGDIR="output/staging/$@/DSCResources"; \
278278
cat Providers/Modules/$@.psd1 | sed "s@<MODULE_VERSION>@$${VERSION}@" > intermediate/Modules/$@.psd1; \
@@ -294,7 +294,7 @@ nx:
294294
else
295295
nx:
296296
rm -rf output/staging; \
297-
VERSION="1.3"; \
297+
VERSION="1.4"; \
298298
PROVIDERS="nxFile nxScript nxUser nxGroup nxService nxPackage nxEnvironment nxSshAuthorizedKeys nxArchive nxFileLine"; \
299299
STAGINGDIR="output/staging/$@/DSCResources"; \
300300
cat Providers/Modules/$@.psd1 | sed "s@<MODULE_VERSION>@$${VERSION}@" > intermediate/Modules/$@.psd1; \
@@ -541,7 +541,7 @@ nxOMSGenerateInventoryMof:
541541

542542
nxOMSPlugin:
543543
rm -rf output/staging; \
544-
VERSION="3.69"; \
544+
VERSION="3.70"; \
545545
PROVIDERS="nxOMSPlugin"; \
546546
STAGINGDIR="output/staging/$@/DSCResources"; \
547547
cat Providers/Modules/$@.psd1 | sed "s@<MODULE_VERSION>@$${VERSION}@" > intermediate/Modules/$@.psd1; \

‎Providers/Modules/Plugins/PatchManagement/plugin/filter_patch_management.rb‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@ def shutdown
3030
end
3131

3232
def filter(tag, time, record)
33+
begin
34+
File.delete("/tmp/az-update-security.list")
35+
OMS::Log.info_once("File deleted successfully. /tmp/az-update-security.list")
36+
rescue Exception => e
37+
if e.errno!=2 #except no such file or directory issue. Errno: ENOENT = 2
38+
raise e
39+
end
40+
end
41+
3342
xml_string = record['xml']
3443
OMS::Log.info_once("LinuxUpdates : Filtering xml size=#{xml_string.size}")
3544
linuxUpdates = LinuxUpdates.new()

‎installbuilder/datafiles/Base_DSC.data‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SHLIB_EXT: 'so'
8383
/opt/microsoft/omsconfig/Scripts/OMSAuditdPlugin.sh; intermediate/Scripts/OMSAuditdPlugin.sh; 755; root; root
8484
/opt/microsoft/omsconfig/Scripts/OMS_MetaConfigHelper.py; intermediate/Scripts/OMS_MetaConfigHelper.py; 755; ${{RUN_AS_USER}}; root
8585
/opt/microsoft/omsconfig/Scripts/python3/OMS_MetaConfigHelper.py; intermediate/Scripts/python3/OMS_MetaConfigHelper.py; 755; ${{RUN_AS_USER}}; root
86-
/opt/microsoft/omsconfig/module_packages/nx_1.3.zip; release/nx_1.3.zip; 755; ${{RUN_AS_USER}}; root
86+
/opt/microsoft/omsconfig/module_packages/nx_1.4.zip; release/nx_1.4.zip; 755; ${{RUN_AS_USER}}; root
8787
/opt/microsoft/omsconfig/module_packages/nxOMSPerfCounter_2.3.zip; release/nxOMSPerfCounter_2.3.zip; 755; ${{RUN_AS_USER}}; root
8888
/opt/microsoft/omsconfig/module_packages/nxOMSSyslog_2.5.zip; release/nxOMSSyslog_2.5.zip; 755; ${{RUN_AS_USER}}; root
8989
/opt/microsoft/omsconfig/module_packages/nxOMSSudoCustomLog_2.8.zip; release/nxOMSSudoCustomLog_2.8.zip; 755; ${{RUN_AS_USER}}; root
@@ -102,7 +102,7 @@ SHLIB_EXT: 'so'
102102
/opt/microsoft/omsconfig/module_packages/nxOMSContainers_1.0.zip; release/nxOMSContainers_1.0.zip; 755; ${{RUN_AS_USER}}; root
103103
/opt/microsoft/omsconfig/module_packages/nxOMSCustomLog_1.0.zip; release/nxOMSCustomLog_1.0.zip; 755; ${{RUN_AS_USER}}; root
104104
/opt/microsoft/omsconfig/module_packages/nxOMSGenerateInventoryMof_1.5.zip; release/nxOMSGenerateInventoryMof_1.5.zip; 755; ${{RUN_AS_USER}}; root
105-
/opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.69.zip; release/nxOMSPlugin_3.69.zip; 755; ${{RUN_AS_USER}}; root
105+
/opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.70.zip; release/nxOMSPlugin_3.70.zip; 755; ${{RUN_AS_USER}}; root
106106
/opt/microsoft/omsconfig/module_packages/nxOMSWLI_1.46.zip; release/nxOMSWLI_1.46.zip; 755; ${{RUN_AS_USER}}; root
107107
#endif
108108

@@ -115,7 +115,7 @@ SHLIB_EXT: 'so'
115115
/opt/microsoft/${{SHORT_NAME}}/etc/dsccore.reg; LCM/dsccore.reg; 755; ${{RUN_AS_USER}}; root
116116
/opt/microsoft/${{SHORT_NAME}}/bin/ConsistencyInvoker; omi-1.0.8/output/bin/ConsistencyInvoker; 755; ${{RUN_AS_USER}}; root
117117
/opt/microsoft/${{SHORT_NAME}}/lib/libdsccore.so; omi-1.0.8/output/lib/libdsccore.so; 755; ${{RUN_AS_USER}}; root
118-
/opt/microsoft/${{SHORT_NAME}}/module_packages/nx_1.3.zip; release/nx_1.3.zip; 755; ${{RUN_AS_USER}}; root
118+
/opt/microsoft/${{SHORT_NAME}}/module_packages/nx_1.4.zip; release/nx_1.4.zip; 755; ${{RUN_AS_USER}}; root
119119

120120

121121
#endif
@@ -391,7 +391,7 @@ fi
391391
# Set up built-in resource modules for OMS DSC
392392
if [ "$pythonVersion" = "python3" ]; then
393393
echo "Running python3, python version is ", $pythonVersion
394-
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nx_1.3.zip 0"
394+
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nx_1.4.zip 0"
395395
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPerfCounter_2.3.zip 0"
396396
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSSyslog_2.5.zip 0"
397397
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSSudoCustomLog_2.8.zip 0"
@@ -400,7 +400,7 @@ if [ "$pythonVersion" = "python3" ]; then
400400
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSGenerateInventoryMof_1.5.zip 0"
401401
else
402402
echo "Running python version is ", $pythonVersion
403-
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nx_1.3.zip 0"
403+
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nx_1.4.zip 0"
404404
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPerfCounter_2.3.zip 0"
405405
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSSyslog_2.5.zip 0"
406406
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSSudoCustomLog_2.8.zip 0"
@@ -418,7 +418,7 @@ if [ "$pythonVersion" = "python3" ]; then
418418
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSContainers_1.0.zip 0"
419419
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSCustomLog_1.0.zip 0"
420420
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSGenerateInventoryMof_1.5.zip 0"
421-
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.69.zip 0"
421+
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.70.zip 0"
422422
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/python3/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSWLI_1.46.zip 0"
423423
else
424424
echo "Running python2 python version is ", $pythonVersion
@@ -428,7 +428,7 @@ else
428428
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSContainers_1.0.zip 0"
429429
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSCustomLog_1.0.zip 0"
430430
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSGenerateInventoryMof_1.5.zip 0"
431-
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.69.zip 0"
431+
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSPlugin_3.70.zip 0"
432432
su - omsagent -c "/opt/microsoft/omsconfig/Scripts/InstallModule.py /opt/microsoft/omsconfig/module_packages/nxOMSWLI_1.46.zip 0"
433433
#endif
434434

@@ -439,13 +439,13 @@ else
439439
# Check if DIY DSC install module script is present on the machine
440440
if [ -f /opt/microsoft/dsc/Scripts/InstallModule.py ]; then
441441
# Check if nx module package is available in DIY DSC
442-
if [ -f /opt/microsoft/dsc/module_packages/nx_1.3.zip ]; then
442+
if [ -f /opt/microsoft/dsc/module_packages/nx_1.4.zip ]; then
443443
if [ "$pythonVersion" = "python3" ]; then
444444
echo "Running python3"
445-
/opt/microsoft/dsc/Scripts/python3/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.3.zip 0
445+
/opt/microsoft/dsc/Scripts/python3/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.4.zip 0
446446
else
447447
echo "Running python2 in Check if DIY DSC install... python version is ", $pythonVersion
448-
/opt/microsoft/dsc/Scripts/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.3.zip 0
448+
/opt/microsoft/dsc/Scripts/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.4.zip 0
449449
fi
450450
fi
451451
fi
@@ -483,10 +483,10 @@ fi
483483
# Set up built-in resource module for DIY DSC
484484
if [ "$pythonVersion" = "python3" ]; then
485485
echo "Running python3"
486-
/opt/microsoft/dsc/Scripts/python3/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.3.zip 0
486+
/opt/microsoft/dsc/Scripts/python3/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.4.zip 0
487487
else
488488
echo "Running python2 in set up built in python version is ", $pythonVersion
489-
/opt/microsoft/dsc/Scripts/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.3.zip 0
489+
/opt/microsoft/dsc/Scripts/InstallModule.py /opt/microsoft/dsc/module_packages/nx_1.4.zip 0
490490
fi
491491

492492

0 commit comments

Comments
 (0)