Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bin/app/azure_monitor_logs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
15 changes: 11 additions & 4 deletions bin/app/logCategories.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion bin/app/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion default/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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