Catchup (#157)

* ignore everything in my test folder

* new resource types, v1.3.3

Author: sebastus

bin/app/azure_monitor_logs.js

@@ -337,7 +337,8 @@ var messageHandler = function (name, data, eventWriter) {
     var tenantId = (data.tenantId || '').toUpperCase();
 
     // get resourceId if it exists
-    var resourceId = (data.resourceId || '').toUpperCase();
+    // recent additions now use resourceid rather than resourceId
+    var resourceId = (data.resourceId || data.resourceid || '').toUpperCase();
 
     // get category if it exists
     var category = (data.category || '').toUpperCase();

bin/app/logCategories.json

@@ -2,6 +2,9 @@
     "MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/JOBLOGS":"amdl:auto:acct:jobLogs",
     "MICROSOFT.AUTOMATION/AUTOMATIONACCOUNTS/JOBSTREAMS":"amdl:auto:acct:jobStreams",
     "MICROSOFT.BATCH/BATCHACCOUNTS/SERVICELOG":"amdl:btch:acct:serviceLog",
+    "MICROSOFT.CONTAINERSERVICE/MANAGEDCLUSTERS/KUBE-APISERVER":"amdl:aks:cluster",
+    "MICROSOFT.CONTAINERSERVICE/MANAGEDCLUSTERS/KUBE-AUDIT":"amdl:aks:audit",
+    "MICROSOFT.CONTAINERSERVICE/MANAGEDCLUSTERS/KUBE-CONTROLLER-MANAGER":"amdl:aks:manager",
     "MICROSOFT.DATALAKEANALYTICS/ACCOUNTS/AUDIT":"amdl:dalk:acct:audit",
     "MICROSOFT.DATALAKEANALYTICS/ACCOUNTS/REQUESTS":"amdl:dalk:acct:requests",
     "MICROSOFT.DATALAKESTORE/ACCOUNTS/AUDIT":"amdl:dlst:acct:audit",
@@ -11,19 +14,23 @@
     "MICROSOFT.KEYVAULT/VAULTS/AUDITEVENT":"amdl:keyv:vaul:auditEvent",
     "MICROSOFT.LOGIC/WORKFLOWS/WORKFLOWRUNTIME":"amdl:logc:wkfl:workflowRuntime",
     "MICROSOFT.LOGIC/INTEGRATIONACCOUNTS/INTEGRATIONACCOUNTTRACKINGEVENTS":"amdl:logc:acct:tracking",
+    "MICROSOFT.NETWORK/AZUREFIREWALLS/AZUREFIREWALLNETWORKRULE":"amdl:net:firewall",
     "MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/NETWORKSECURITYGROUPEVENT":"amdl:net:nsg:event",
     "MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/NETWORKSECURITYGROUPRULECOUNTER":"amdl:net:nsg:rule",
     "MICROSOFT.NETWORK/LOADBALANCERS/LOADBALANCERALERTEVENT":"amdl:net:lb:alert",
     "MICROSOFT.NETWORK/LOADBALANCERS/LOADBALANCERPROBEHEALTHSTATUS":"amdl:net:lb:probeHealth",
     "MICROSOFT.NETWORK/APPLICATIONGATEWAYS/APPLICATIONGATEWAYACCESSLOG":"amdl:net:ag:access",
     "MICROSOFT.NETWORK/APPLICATIONGATEWAYS/APPLICATIONGATEWAYPERFORMANCELOG":"amdl:net:ag:perf",
     "MICROSOFT.NETWORK/APPLICATIONGATEWAYS/APPLICATIONGATEWAYFIREWALLLOG":"amdl:net:ag:firewall",
+    "MICROSOFT.NETWORK/VIRTUALNETWORKGATEWAYS/P2SDIAGNOSTICLOG":"amdl:net:vnetgateway",
+    "MICROSOFT.NETWORK/VIRTUALNETWORKGATEWAYS/IKEDIAGNOSTICLOG":"amdl:net:vnetgateway",
     "MICROSOFT.SEARCH/SEARCHSERVICES/OPERATIONLOGS":"amdl:srch:srch:operationLogs",
     "MICROSOFT.SERVERMANAGEMENT/NODES/REQUESTLOGS":"amdl:srvr:node:requestLogs",
     "MICROSOFT.SERVICEBUS/NAMESPACES/OPERATIONALLOGS":"amdl:sb:ns:operationalLogs",
+    "MICROSOFT.SQL/SERVERS/DATABASES/QUERYSTORERUNTIMESTATISTICS":"amdl:sql:db:stats",
     "MICROSOFT.STREAMANALYTICS/STREAMINGJOBS/EXECUTION":"amdl:sa:jobs:execution",
     "MICROSOFT.STREAMANALYTICS/STREAMINGJOBS/AUTHORING":"amdl:sa:jobs:authoring",
-    "MICROSOFT.SECURITYGRAPH/ALERT": "amdl:securitygraph:alert",
-    "MICROSOFT.AADIAM/AUDIT": "amdl:aadal:audit",
-    "MICROSOFT.AADIAM/SIGNIN": "amdl:aadal:signin"
-}
+    "MICROSOFT.SECURITYGRAPH/ALERT":"amdl:securitygraph:alert",
+    "MICROSOFT.AADIAM/AUDIT":"amdl:aadal:audit",
+    "MICROSOFT.AADIAM/SIGNIN":"amdl:aadal:signin"
+  }

bin/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azure_monitor",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Azure Monitor Addon For Splunk",
   "main": "azure_diagnostic_logs.js",
   "dependencies": {

default/app.conf

@@ -8,7 +8,7 @@ label = Azure Monitor
 [launcher]
 author=Greg Oliver
 description=Azure Monitor - consumes monitoring telemetry, both logs and metrics, for ARM-based Azure resources.
-version = 1.3.2
+version = 1.3.3
 
 [package]
 id=TA-Azure_Monitor