Merge pull request #79 from logicmonitor/develop

prakalp05 · web-flow · commit 33f31bf9329d · 2024-12-17T10:38:55.000+05:30
Need domain support for govcloud | Keeping TLS version configurable in the template
diff --git a/arm-template-deployment/deployRGParent.json b/arm-template-deployment/deployRGParent.json
@@ -2,38 +2,50 @@
   "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "variables": {
-    "sourceCodeBranch" : "master",
+    "sourceCodeBranch": "master",
     "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',variables('sourceCodeBranch'),'/arm-template-deployment/')]",
-    "deploymentResourceGroupName": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''),'-group')]",
-    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''))]",
+    "deploymentResourceGroupName": "[concat('lm-logs','-',parameters('LM_Company_Name'), '-', replace(parameters('Resource_Group_Region'),' ',''),'-group')]",
+    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_Name'), '-', replace(parameters('Resource_Group_Region'),' ',''))]",
     "eventhubLogsName": "log-hub",
     "subscriptionId": "[subscription().subscriptionId]",
     "eventHubAuthorizationRuleId": "[concat('/subscriptions/', variables('subscriptionId'), '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.EventHub/namespaces/', variables('eventhubNamespace'), '/authorizationRules/RootManageSharedAccessKey')]"
   },
   "parameters": {
-    "resource_group_region": {
+    "Resource_Group_Region": {
       "type": "String"
     },
-    "LM_Company_name": {
+    "LM_Company_Name": {
       "type": "String"
     },
+    "LM_Domain_Name": {
+      "type": "string",
+      "defaultValue": "logicmonitor.com",
+      "allowedValues": [
+        "logicmonitor.com",
+        "lmgov.us",
+        "qa-lmgov.us"
+      ],
+      "metadata": {
+        "description": "Domain of LM Platform where logs are to be sent."
+      }
+    },
     "LM_Access_Id": {
       "type": "String",
-      "defaultValue":"",
+      "defaultValue": "",
       "metadata": {
         "description": "LogicMonitor API Token access ID."
       }
     },
     "LM_Access_Key": {
       "type": "String",
-      "defaultValue":"",
+      "defaultValue": "",
       "metadata": {
         "description": "LogicMonitor API Token access Key."
       }
     },
     "LM_Bearer_Token": {
       "type": "String",
-      "defaultValue":"",
+      "defaultValue": "",
       "metadata": {
         "description": "LM API Bearer Token.\nEither specify access_id and access_key both or bearer_token. If all specified, LMv1 token(access_id and access_key) will be used for authentication with LogicMonitor."
       }
@@ -46,33 +58,26 @@
     },
     "Azure_Account_Name": {
       "type": "string",
-      "defaultValue":"",
+      "defaultValue": "",
       "metadata": {
         "description": "Azure Account Name created during the creation of azure account in LM"
       }
     },
     "Include_Metadata_keys": {
       "type": "string",
-      "defaultValue":"resourceId",
+      "defaultValue": "resourceId",
       "metadata": {
         "description": "comma separated keys to add as event metadata in a lm-log event. for nested json specify '.' eg - properties.functionName,properties.message "
       }
     },
-    "LMTenantId": {
+    "LM_Tenant_Id": {
       "type": "string",
-      "defaultValue":"",
+      "defaultValue": "",
       "metadata": {
         "description": "LogicMonitor Tenant Identifier sent as event metadata to LogicMonitor"
       }
     },
-    "Resource_Type": {
-      "type": "string",
-      "defaultValue": "Azure",
-      "metadata": {
-        "description": "Type of platform from where logs are coming."
-      }
-    },
-    "enableActivityLogs": {
+    "Enable_Activity_Logs": {
       "type": "String",
       "allowedValues": [
         "Yes",
@@ -82,14 +87,30 @@
         "description": "Enable Activity logs to be sent to the event hub that will get created in this deployment"
       },
       "defaultValue": "Yes"
+    },
+    "TLSVersionStorageAccount": {
+      "type": "string",
+      "defaultValue": "1_2",
+      "metadata": {
+        "description": "Provide an appropriate TLS version for storage account. Format - X_X"
+      }
+    },
+    "TLSVersionFunctionApp": {
+      "type": "string",
+      "defaultValue": "1.3",
+      "metadata": {
+        "description": "Provide an appropriate TLS version for function app. Format - X.X"
+      }
     }
+
+
   },
   "resources": [
     {
       "condition": "[or(and(not(empty(parameters('LM_Access_Id'))), not(empty(parameters('LM_Access_Key')))), not(empty(parameters('LM_Bearer_Token'))))]",
       "type": "Microsoft.Resources/resourceGroups",
       "apiVersion": "2018-05-01",
-      "location": "[parameters('resource_group_region')]",
+      "location": "[parameters('Resource_Group_Region')]",
       "name": "[variables('deploymentResourceGroupName')]",
       "properties": {}
     },
@@ -106,11 +127,14 @@
           "contentVersion": "1.0.0.0"
         },
         "parameters": {
-          "azure_region": {
-            "value": "[parameters('resource_group_region')]"
+          "Azure_Region": {
+            "value": "[parameters('Resource_Group_Region')]"
           },
-          "LM_Company_name": {
-            "value": "[parameters('LM_Company_name')]"
+          "LM_Company_Name": {
+            "value": "[parameters('LM_Company_Name')]"
+          },
+          "LM_Domain_Name": {
+            "value": "[parameters('LM_Domain_Name')]"
           },
           "LM_Access_Id": {
             "value": "[parameters('LM_Access_Id')]"
@@ -133,11 +157,14 @@
           "Include_Metadata_keys": {
             "value": "[parameters('Include_Metadata_keys')]"
           },
-          "LMTenantId" : {
-            "value": "[parameters('LMTenantId')]"
+          "LM_Tenant_Id" : {
+            "value": "[parameters('LM_Tenant_Id')]"
+          },
+          "TLSVersionStorageAccount": {
+            "value": "[parameters('TLSVersionStorageAccount')]"
           },
-          "Resource_Type": {
-            "value": "[parameters('Resource_Type')]"
+          "TLSVersionFunctionApp": {
+            "value": "[parameters('TLSVersionFunctionApp')]"
           }
         }
       },
@@ -146,7 +173,7 @@
       ]
     },
     {
-      "condition": "[equals(parameters('enableActivityLogs'), 'Yes')]",
+      "condition": "[equals(parameters('Enable_Activity_Logs'), 'Yes')]",
       "type": "Microsoft.Insights/diagnosticSettings",
       "apiVersion": "2017-05-01-preview",
       "name": "[variables('deploymentResourceGroupName')]",
@@ -195,4 +222,4 @@
     }
   ],
   "outputs": {}
-}
+}
diff --git a/arm-template-deployment/deployResourcesInRG.json b/arm-template-deployment/deployResourcesInRG.json
@@ -2,7 +2,7 @@
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "LM_Company_name": {
+    "LM_Company_Name": {
       "type": "string"
     },
     "LM_Access_Id": {
@@ -23,30 +23,37 @@
     "Include_Metadata_keys": {
       "type": "string"
     },
-    "LMTenantId": {
+    "LM_Tenant_Id": {
       "type": "string"
     },
-    "azure_region": {
+    "Azure_Region": {
       "type": "string"
     },
     "sourceCodeBranch": {
       "type": "string"
     },
-    "Resource_Type": {
+    "LM_Domain_Name": {
       "type": "string"
+    },
+    "TLSVersionStorageAccount" : {
+      "type"  : "string"
+    },
+    "TLSVersionFunctionApp" : {
+      "type" : "string"
     }
   },
   "variables": {
-    "logsFunctionAppName": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('azure_region'),' ',''))]",
-    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('azure_region'),' ',''))]",
-    "storage": "[toLower(concat(parameters('LM_Company_name'), replace(parameters('azure_region'),' ','')))]",
+    "logsFunctionAppName": "[concat('lm-logs','-',parameters('LM_Company_Name'), '-', replace(parameters('Azure_Region'),' ',''))]",
+    "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_Name'), '-', replace(parameters('Azure_Region'),' ',''))]",
+    "storage": "[toLower(concat(parameters('LM_Company_Name'), replace(parameters('Azure_Region'),' ','')))]",
     "lmAppStorageAccounts": "[if(greater(length(variables('storage')) , 24), substring(variables('storage'), sub(length(variables('storage')) , 24), 24) , variables('storage'))]",
     "eventhubLogsName": "log-hub",
     "ConsumergroupsLogsName": "LMConsumerGroup",
     "functionServerfarms": "[concat(variables('eventhubNamespace'),'-service-plan')]",
     "listener": "listener",
     "sender": "sender",
-    "lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]"
+    "lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]",
+    "tlsVersionStorageAccount" : "[concat('TLS',parameters('TLSVersionStorageAccount'))]"
   },
   "resources": [
     {
@@ -74,7 +81,7 @@
       "apiVersion": "2019-06-01",
       "location": "[resourceGroup().location]",
       "properties": {
-        "minimumTlsVersion": "TLS1_2",
+        "minimumTlsVersion": "[variables('tlsVersionStorageAccount')]",
         "encryption": {
           "services": {
             "file": {
@@ -159,15 +166,15 @@
             },
             {
               "name": "LM_COMPANY",
-              "value": "[parameters('LM_Company_name')]"
+              "value": "[parameters('LM_Company_Name')]"
             },
             {
-              "name" : "LM_AUTH",
-              "value" : "[variables('lm_auth')]"
+              "name": "LM_AUTH",
+              "value": "[variables('lm_auth')]"
             },
             {
-              "name" : "LM_TENANT_ID",
-              "value" : "[parameters('LMTenantId')]"
+              "name": "LM_TENANT_ID",
+              "value": "[parameters('LM_Tenant_Id')]"
             },
             {
               "name": "AzureClientID",
@@ -199,17 +206,18 @@
             },
             {
               "name": "Include_Metadata_keys",
-              "value" : "[parameters('Include_Metadata_keys')]"
+              "value": "[parameters('Include_Metadata_keys')]"
             },
             {
               "name": "LOG_LEVEL",
-              "value" : "WARNING"
+              "value": "WARNING"
             },
             {
-              "name": "RESOURCE_TYPE",
-              "value": "[Parameters('Resource_Type')]"
+              "name": "LM_DOMAIN_NAME",
+              "value": "[parameters('LM_Domain_Name')]"
             }
-          ]
+          ],
+          "minTlsVersion" : "[parameters('TLSVersionFunctionApp')]"
         }
       },
       "dependsOn": [
@@ -275,4 +283,4 @@
       ]
     }
   ]
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -25,32 +25,32 @@ repositories {
 }
 
 dependencies {
-    implementation (
-        "com.microsoft.azure.functions:azure-functions-java-library:1.4.0",
-        "com.logicmonitor:lm-logs-sdk-java:1.2",
-        "com.logicmonitor:lm-data-sdk:0.0.4-alpha",
-        "com.google.code.gson:gson:2.8.6"
+    implementation(
+            "com.logicmonitor:lm-data-sdk:0.0.5-alpha",
+            "com.microsoft.azure.functions:azure-functions-java-library:1.4.0",
+            "com.logicmonitor:lm-logs-sdk-java:1.2",
+            "com.google.code.gson:gson:2.8.6"
     )
-   implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
     implementation 'io.gsonfire:gson-fire:1.8.5'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'org.apache.commons:commons-lang3:3.9'
     implementation 'com.jayway.jsonpath:json-path:2.5.0'
     implementation 'org.slf4j:slf4j-nop:1.7.25'
 
-    testImplementation (
-        "org.junit.jupiter:junit-jupiter:${junitVersion}",
-        "com.github.stefanbirkner:system-lambda:1.0.0",
-        "org.mockito:mockito-core:3.4.4",
-        "org.glassfish.jersey.test-framework:jersey-test-framework-core:${jerseyVersion}",
-        "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:${jerseyVersion}"
+    testImplementation(
+            "org.junit.jupiter:junit-jupiter:${junitVersion}",
+            "com.github.stefanbirkner:system-lambda:1.0.0",
+            "org.mockito:mockito-core:3.4.4",
+            "org.glassfish.jersey.test-framework:jersey-test-framework-core:${jerseyVersion}",
+            "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:${jerseyVersion}"
     )
     testCompileOnly(
-        "junit:junit:4.12"
+            "junit:junit:4.12"
     )
     testRuntimeOnly(
-        "org.junit.vintage:junit-vintage-engine:${junitVersion}"
+            "org.junit.vintage:junit-vintage-engine:${junitVersion}"
     )
 }
 
@@ -68,7 +68,7 @@ test {
 jar {
     manifest {
         attributes 'Implementation-Title': project.getName(),
-                   'Implementation-Version': project.getVersion()
+                'Implementation-Version': project.getVersion()
     }
 }
 
diff --git a/local.settings.json b/local.settings.json
@@ -17,7 +17,7 @@
         "LOG_LEVEL" : "WARNING",
         "LM_TENANT_ID" : "sample_tenant_id",
         "LM_AUTH": "{\"LM_ACCESS_ID\": \"id\", \"LM_ACCESS_KEY\" : \"key\", \"LM_BEARER_TOKEN\" : \"token\"}",
-        "AzureAccountName": "LMTest Account",
-        "RESOURCE_TYPE": "Azure"
+        "AzureAccountName": "<Logicmonitor Azure Account>",
+        "LM_DOMAIN_NAME" : "<LogicMonitor company domain>"
     }
 }
diff --git a/package/lm-logs-azure.zip b/package/lm-logs-azure.zip
diff --git a/src/main/java/com/logicmonitor/logs/azure/LogEventAdapter.java b/src/main/java/com/logicmonitor/logs/azure/LogEventAdapter.java
@@ -102,8 +102,6 @@ public class LogEventAdapter implements Function<String, List<LogEntry>> {
     public static final String AZURE_CATEGORY = "category";
     public static final String LM_TENANT_ID = "LM_TENANT_ID";
 
-    public static final String RESOURCE_TYPE_KEY = "RESOURCE_TYPE";
-    public static final String RESOURCE_TYPE_FIELD = "_resource.type";
     public static final String LM_TENANT_ID_KEY = "_lm.tenantId";
 
     public static final Pattern RESOURCE_TYPE = Pattern.compile("/subscriptions/.*/resourceGroups/.*/providers/(?<type>[^/]*/[^/]*)/.*", Pattern.CASE_INSENSITIVE);
@@ -115,7 +113,7 @@ public class LogEventAdapter implements Function<String, List<LogEntry>> {
     /**
      * Required static metadata to be added in every LogEntry.
      */
-    public static final Map<String, String> REQ_STATIC_METADATA = Map.of("_integration", "azure");
+    public static final Map<String, String> REQ_STATIC_METADATA = Map.of("_integration", "azure", "_resource.type", "Azure");
 
     /**
      * Required metadata key to LogEventMessage method map.
@@ -254,11 +252,6 @@ protected LogEntry createEntry(JsonObject json) {
             metadata.put(LM_TENANT_ID_KEY, tenantId);
         }
 
-        String resourceType = System.getenv(RESOURCE_TYPE_KEY);
-        if(StringUtils.isNotBlank(resourceType)){
-            metadata.put(RESOURCE_TYPE_FIELD, resourceType);
-        }
-
         entry.setMetadata(metadata);
         if (scrubPattern != null) {
             message = scrubPattern.matcher(message).replaceAll("");
diff --git a/src/main/java/com/logicmonitor/logs/azure/LogEventForwarder.java b/src/main/java/com/logicmonitor/logs/azure/LogEventForwarder.java

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"LOG_LEVEL" : "WARNING",`
`18`	`18`	`"LM_TENANT_ID" : "sample_tenant_id",`
`19`	`19`	`"LM_AUTH": "{\"LM_ACCESS_ID\": \"id\", \"LM_ACCESS_KEY\" : \"key\", \"LM_BEARER_TOKEN\" : \"token\"}",`
`20`		`- "AzureAccountName": "LMTest Account",`
`21`		`- "RESOURCE_TYPE": "Azure"`
	`20`	`+ "AzureAccountName": "<Logicmonitor Azure Account>",`
	`21`	`+ "LM_DOMAIN_NAME" : "<LogicMonitor company domain>"`
`22`	`22`	`}`
`23`	`23`	`}`