Merge pull request #65 from Azure/dev/dpoole/update-vmwatch-4-30

Updating vmwatch binaries to 1.1.0 package

integration-test/env/Extension/bin/VMWatch/version.txt

@@ -1 +1 @@
-1.0.02599.77-official-7ab71d91
+1.0.02676.133-official-140ddf5b

integration-test/env/Extension/bin/VMWatch/vmwatch.conf

@@ -111,7 +111,7 @@
   # statefile = ""
 
 [[inputs.outbound_connectivity]]
-  interval = "${OUTBOUND_CONNECTIVITY_INTERVAL:-180s}"
+  interval = "${OUTBOUND_CONNECTIVITY_INTERVAL:-60s}"
   name_suffix = "${OUTBOUND_CONNECTIVITY_NAME_SUFFIX:-}"
   urls = "${OUTBOUND_CONNECTIVITY_URLS:-http://www.msftconnecttest.com/connecttest.txt}"
   timeout_in_milliseconds = ${OUTBOUND_CONNECTIVITY_TIMEOUT_IN_MILLISECONDS:-30000}
@@ -131,10 +131,13 @@
 [[inputs.az_storage_blob]]
     interval = "${AZ_STORAGE_BLOB_INTERVAL:-180s}"
     name_suffix = "${AZ_STORAGE_BLOB_NAME_SUFFIX:-}"
-    storage_account_name = "${AZ_STORAGE_ACCOUNT_NAME:-xstoreverifier}"
-    container_name = "${AZ_STORAGE_CONTAINER_NAME:-xstoreverifier}"
-    blob_name = "${AZ_BLOB_NAME:-VMAAgentTestBlobNew.txt}"
-    sas_token_base64 = "${AZ_STORAGE_SAS_TOKEN_BASE64:-c3A9ciZzdD0yMDIxLTA4LTAyVDIwOjEyOjExWiZzZT0yMDk5LTA4LTAzVDA0OjEyOjExWiZzcHI9aHR0cHMmc3Y9MjAyMC0wOC0wNCZzcj1iJnNpZz10aXBBUjV0dXN6N044N1IxWGpra1M4bWlrUHZma3RHMmtVZWo3MmRCVDdFJTNE}"
+    storage_account_name = "${AZ_STORAGE_ACCOUNT_NAME:-}"
+    container_name = "${AZ_STORAGE_CONTAINER_NAME:-}"
+    blob_name = "${AZ_STORAGE_BLOB_NAME:-}"
+    blob_domain_name = "${AZ_STORAGE_BLOB_DOMAIN_NAME:-blob.core.windows.net}"
+    sas_token_base64 = "${AZ_STORAGE_SAS_TOKEN_BASE64:-}"
+    use_managed_identity = ${AZ_STORAGE_USE_MANAGED_IDENTITY:-false}
+    managed_identity_client_id = "${AZ_STORAGE_MANAGED_IDENTITY_CLIENT_ID:-}"
 
 [[inputs.clockskew]]
     interval = "${CLOCK_SKEW_INTERVAL:-180s}"
@@ -164,6 +167,26 @@
     name_suffix = "${DNS_NAME_SUFFIX:-}"
     dns_names = "${DNS_NAMES:-www.msftconnecttest.com}"
 
+[[inputs.imds]]
+    interval = "${IMDS_INTERVAL:-180s}"
+    name_suffix = "${IMDS_NAME_SUFFIX:-}"
+    imds_endpoint = "${IMDS_ENDPOINT:-http://169.254.169.254/metadata/instance/compute}"
+    timeout_in_seconds = ${IMDS_TIMEOUT_IN_SECONDS:-10}
+    retry_interval_in_seconds = ${IMDS_RETRY_INTERVAL_IN_SEONDS:-3}
+    query_Total_attempts = ${IMDS_QUERY_TOTAL_ATTEMPTS:-3}
+
+[[inputs.tcp_stats]]
+    interval = "${TCP_STATS_INTERVAL:-180s}"
+    name_suffix = "${TCP_STATS_NAME_SUFFIX:-}"
+
+[[inputs.process_cpu]]
+    interval = "${PROCESS_CPU_INTERVAL:-180s}"
+    name_suffix = "${PROCESS_CPU_NAME_SUFFIX:-}"
+
+[[inputs.hardware_health_monitor]]
+  interval = "${HARDWARE_HEALTH_MONITOR_INTERVAL:-180s}"
+  name_override = "hardware_health_monitor"
+
 [[aggregators.check_aggregator]]
     period = "${CHECK_AGGREGATION_INTERVAL:-300s}"
     drop_original = true
@@ -176,6 +199,19 @@
     [aggregators.metric_aggregator.tagpass]
       EventLevel = ["Metric"]
 
+[[aggregators.eventlog_aggregator]]
+    period = "${EVENTLOG_AGGREGATION_INTERVAL:-300s}"
+    drop_original = true
+    max_allowed_count =  ${EVENTLOG_AGGREGATION_MAX_ALLOWED_COUNT:-3}
+    [aggregators.eventlog_aggregator.tagpass]
+      EventLevel = ["EventLog"]
+
+[[processors.event_processor]]
+    period = "${EVENT_PROCESSOR_INTERVAL:-300s}"
+    namepass = ["hardware_health_monitor"]
+    [processors.event_processor.tagdrop]
+      EventLevel = ["EventLog"]  # Telegraf processor processes signals sent from both inputs and aggregators. To prevent signals from feeding into the processor again after aggregation, excluding signals with tag EventLevel=EventLog as the processor adds this tag after processing.
+
 # Send telegraf metrics to file(s)
 [[outputs.file]]
   flush_interval = "30s"
@@ -204,7 +240,7 @@
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "json"
   json_timestamp_format = "2006-01-02T15:04:05Z07:00"
-  json_nested_fields_include = ["RuntimeParameters", "Errors", "Stats"]
+  json_nested_fields_include = ["RuntimeParameters", "Errors", "Stats", "Contents"]
   json_transformation = '''
     $merge([{"Timestamp": timestamp, "Message": $string( $merge([{"Name": name}, fields]) )}, tags])
   '''
@@ -236,7 +272,7 @@
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
   data_format = "json"
   json_timestamp_format = "2006-01-02T15:04:05Z07:00"
-  json_nested_fields_include = ["RuntimeParameters", "Errors", "Stats"]
+  json_nested_fields_include = ["RuntimeParameters", "Errors", "Stats", "Contents"]
   json_transformation = '''
     $merge([{"Timestamp": timestamp, "Message": $string( $merge([{"Name": name}, fields]) )}, tags])
   '''