Add telemetry for azure slice and custom agent unit files #2150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
narrieta
requested review from
kevinclark19a,
larohra and
ZhidongPeng
as code owners
Codecov Report
@@ Coverage Diff @@
## develop #2150 +/- ##
===========================================
- Coverage 70.66% 70.50% -0.16%
===========================================
Files 95 95
Lines 12993 13062 +69
Branches 1850 1859 +9
===========================================
+ Hits 9181 9209 +28
- Misses 3401 3437 +36
- Partials 411 416 +5
Continue to review full report at Codecov.
|
narrieta
commented
Jan 27, 2021
larohra
reviewed
Jan 27, 2021
| match = re.match(r'\s?(azure[^\s]*)\s?', line, re.IGNORECASE) | ||
| if match is not None: | ||
| azure_unit_name = match.group(1) | ||
| azure_unit_description = line |
There was a problem hiding this comment.
Shouldn't you break once you find your first match? Or maybe capture all the possible options (and make azure_unit_name an array instead?)
There was a problem hiding this comment.
good point; i'll make it handle multiple instances (if any)
| for unit_file in agent_unit_files: | ||
| try: | ||
| with open(unit_file, "r") as file_object: | ||
| message = "Found a custom unit file for the agent: {0}\n{1}".format(unit_file, file_object.read()) |
There was a problem hiding this comment.
This is very cool and much needed! This would give us a very good idea on how many VMs/Customers are modifying us without us knowing!
There was a problem hiding this comment.
yes, it should be helpful. sample logging:
2021-01-27T00:51:34.078443Z INFO ExtHandler ExtHandler Found an Azure unit under -.slice: azure.slice loaded active active Slice for Azure VM Agent and Extensions
2021-01-27T00:51:34.091817Z INFO ExtHandler ExtHandler Found a custom unit file for the agent: /etc/systemd/system/walinuxagent.service
#
# NOTE:
# This file hosted on WALinuxAgent repository only for reference purposes.
# Please refer to a recent image to find out the up-to-date systemd unit file.
#
[Unit]
Description=Azure Linux Agent
After=network-online.target cloud-init.service
Wants=network-online.target sshd.service sshd-keygen.service
ConditionFileIsExecutable=/usr/sbin/waagent
ConditionPathExists=/etc/waagent.conf
[Service]
Type=simple
ExecStart=/usr/bin/python3 -u /usr/sbin/waagent -daemon
Restart=always
[Install]
WantedBy=multi-user.target
2021-01-27T00:51:34.092579Z INFO ExtHandler ExtHandler Found a custom unit file for the agent: /etc/systemd/system/walinuxagent.service.d/10-azure-walinuxagent.system.conf
[Service]
Slice=azure.slice
CPUAccounting=yes
2021-01-27T00:51:34.093055Z INFO ExtHandler ExtHandler Found a custom unit file for the agent: /etc/systemd/system/walinuxagent.service.d/20-azure-walinuxagent.system.conf
[Service]
Slice=azure.slice
MemoryAccounting=yes
kevinclark19a
previously approved these changes
Jan 27, 2021
larohra
previously approved these changes
Jan 27, 2021
larohra
approved these changes
Jan 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Send telemetry if there are units named "azure*" and if there are unit files that override the default agent settings