Report usage of StopAutoUpdate policy in borgmon charts
Omaha already has an event result for reporting UpdateDeferred (9)
which shows up in the borgman charts. In order to use that we should
perform a normal updatecheck without the updatedisabled set to true and
then discard the response with event type UpdateComplete (3) but with
event result UpdateDeferred (9).
BUG=28645: Report StopAutoUpdate enforcement in Borgmon charts for Omaha
TEST=Tested success, error and deferred cases on my zgb.
Change-Id: I27cb4465ea9876b39edaff3b747ada44a4f875d4
Reviewed-on: https://gerrit.chromium.org/gerrit/19112
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Jay Srinivasan <jaysri@chromium.org>
Tested-by: Jay Srinivasan <jaysri@chromium.org>
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index c97a9a7..8329c56 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -100,12 +100,15 @@
if (event == NULL) {
body = GetPingBody(ping_active_days, ping_roll_call_days);
if (!ping_only) {
+ // not passing update_disabled to Omaha because we want to
+ // get the update and report with UpdateDeferred result so that
+ // borgmon charts show up updates that are deferred. This is also
+ // the expected behavior when we move to Omaha v3.0 protocol, so it'll
+ // be consistent.
body += StringPrintf(
" <o:updatecheck"
- " updatedisabled=\"%s\""
" targetversionprefix=\"%s\""
"></o:updatecheck>\n",
- params.update_disabled ? "true" : "false",
XmlEncode(params.target_version_prefix).c_str());
// If this is the first update check after a reboot following a previous
@@ -460,7 +463,7 @@
}
if (params_.update_disabled) {
- LOG(ERROR) << "Ignoring Omaha updates as updates are disabled by policy.";
+ LOG(INFO) << "Ignoring Omaha updates as updates are disabled by policy.";
completer.set_code(kActionCodeOmahaUpdateIgnoredPerPolicy);
return;
}