IngestionMode Flag (Azure#9654)

* IngestionMode Flag * fix for missing bracket * diganostic with an A
00Kai0 · Oct 12, 2020 · e782bc0 · e782bc0
1 parent fb3315c
commit e782bc0
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 27 deletions.
diff --git a/...sights/resource-manager/Microsoft.Insights/preview/2018-05-01-preview/components_API.json b/...sights/resource-manager/Microsoft.Insights/preview/2018-05-01-preview/components_API.json
@@ -532,6 +532,20 @@
         "publicNetworkAccessForQuery": {
           "description": "The network access type for accessing Application Insights query.",
           "$ref": "#/definitions/PublicNetworkAccessType"
+        },
+        "IngestionMode": {
+          "type": "string",
+          "description": "Indicates the flow of the ingestion.",
+          "default": "ApplicationInsights",
+          "enum": [
+            "ApplicationInsights",
+            "ApplicationInsightsWithDiagnosticSettings",
+            "LogAnalytics"
+          ],
+          "x-ms-enum": {
+            "name": "IngestionMode",
+            "modelAsString": true
+          }
         }
       },
       "required": [

diff --git a/...urce-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsCreate.json b/...urce-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsCreate.json
@@ -41,7 +41,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     },
@@ -71,7 +72,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...esource-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsGet.json b/...esource-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsGet.json
@@ -32,7 +32,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...source-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsList.json b/...source-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsList.json
@@ -32,7 +32,8 @@
               "DisableIpMasking": false,
               "ImmediatePurgeDataOn30Days": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "ApplicationInsights"
             }
           },
           {
@@ -60,7 +61,8 @@
               "DisableIpMasking": false,
               "ImmediatePurgeDataOn30Days": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "ApplicationInsights"
             }
           }
         ],

diff --git a/...Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsListByResourceGroup.json b/...Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsListByResourceGroup.json
@@ -33,7 +33,8 @@
               "DisableIpMasking": false,
               "ImmediatePurgeDataOn30Days": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "ApplicationInsights"
             }
           },
           {
@@ -61,7 +62,8 @@
               "DisableIpMasking": false,
               "ImmediatePurgeDataOn30Days": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "ApplicationInsights"
             }
           }
         ],

diff --git a/...urce-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsUpdate.json b/...urce-manager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsUpdate.json
@@ -43,7 +43,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     },
@@ -76,7 +77,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...ager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsUpdateTagsOnly.json b/...ager/Microsoft.Insights/preview/2018-05-01-preview/examples/ComponentsUpdateTagsOnly.json
@@ -47,7 +47,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     },
@@ -83,7 +84,8 @@
           "DisableIpMasking": false,
           "ImmediatePurgeDataOn30Days": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...sights/resource-manager/Microsoft.Insights/preview/2020-02-02-preview/components_API.json b/...sights/resource-manager/Microsoft.Insights/preview/2020-02-02-preview/components_API.json
@@ -524,6 +524,20 @@
         "publicNetworkAccessForQuery": {
           "description": "The network access type for accessing Application Insights query.",
           "$ref": "#/definitions/PublicNetworkAccessType"
+        },
+        "IngestionMode": {
+          "type": "string",
+          "description": "Indicates the flow of the ingestion.",
+          "default": "LogAnalytics",
+          "enum": [
+            "ApplicationInsights",
+            "ApplicationInsightsWithDiagnosticSettings",
+            "LogAnalytics"
+          ],
+          "x-ms-enum": {
+            "name": "IngestionMode",
+            "modelAsString": true
+          }
         }
       },
       "required": [

diff --git a/...urce-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsCreate.json b/...urce-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsCreate.json
@@ -41,7 +41,8 @@
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "LogAnalytics"
         }
       }
     }

diff --git a/...esource-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsGet.json b/...esource-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsGet.json
@@ -31,7 +31,8 @@
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "LogAnalytics"
         }
       }
     }

diff --git a/...source-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsList.json b/...source-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsList.json
@@ -31,7 +31,8 @@
               "ConnectionString": "InstrumentationKey=dc5931c7-a7ad-4ad0-89d6-123456789abc",
               "DisableIpMasking": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "LogAnalytics"
             }
           },
           {
@@ -58,7 +59,8 @@
               "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
               "DisableIpMasking": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "LogAnalytics"
             }
           }
         ],

diff --git a/...Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsListByResourceGroup.json b/...Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsListByResourceGroup.json
@@ -32,7 +32,8 @@
               "ConnectionString": "InstrumentationKey=dc5931c7-a7ad-4ad0-89d6-123456789abc",
               "DisableIpMasking": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "LogAnalytics"
             }
           },
           {
@@ -59,7 +60,8 @@
               "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
               "DisableIpMasking": false,
               "publicNetworkAccessForQuery": "Enabled",
-              "publicNetworkAccessForIngestion": "Enabled"
+              "publicNetworkAccessForIngestion": "Enabled",
+              "IngestionMode": "LogAnalytics"
             }
           }
         ],

diff --git a/...urce-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsUpdate.json b/...urce-manager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsUpdate.json
@@ -42,7 +42,8 @@
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "LogAnalytics"
         }
       }
     }

diff --git a/...ager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsUpdateTagsOnly.json b/...ager/Microsoft.Insights/preview/2020-02-02-preview/examples/ComponentsUpdateTagsOnly.json
@@ -46,7 +46,8 @@
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
           "publicNetworkAccessForQuery": "Enabled",
-          "publicNetworkAccessForIngestion": "Enabled"
+          "publicNetworkAccessForIngestion": "Enabled",
+          "IngestionMode": "LogAnalytics"
         }
       }
     }

diff --git a/...icationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/components_API.json b/...icationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/components_API.json
@@ -512,6 +512,20 @@
             "$ref": "#/definitions/PrivateLinkScopedResource"
           },
           "description": "List of linked private link scope resources."
+        },
+        "IngestionMode": {
+          "type": "string",
+          "description": "Indicates the flow of the ingestion.",
+          "default": "ApplicationInsights",
+          "enum": [
+            "ApplicationInsights",
+            "ApplicationInsightsWithDiagnosticSettings",
+            "LogAnalytics"
+          ],
+          "x-ms-enum": {
+            "name": "IngestionMode",
+            "modelAsString": true
+          }
         }
       },
       "required": [

diff --git a/...ghts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsCreate.json b/...ghts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsCreate.json
@@ -39,7 +39,8 @@
           "RetentionInDays": 90,
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
-          "ImmediatePurgeDataOn30Days": false
+          "ImmediatePurgeDataOn30Days": false,
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...nsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsGet.json b/...nsights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsGet.json
@@ -30,7 +30,8 @@
           "RetentionInDays": 90,
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
-          "ImmediatePurgeDataOn30Days": false
+          "ImmediatePurgeDataOn30Days": false,
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...sights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsList.json b/...sights/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsList.json
@@ -30,7 +30,8 @@
               "RetentionInDays": 90,
               "ConnectionString": "InstrumentationKey=dc5931c7-a7ad-4ad0-89d6-123456789abc",
               "DisableIpMasking": false,
-              "ImmediatePurgeDataOn30Days": false
+              "ImmediatePurgeDataOn30Days": false,
+              "IngestionMode": "ApplicationInsights"
             }
           },
           {
@@ -56,7 +57,8 @@
               "RetentionInDays": 90,
               "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
               "DisableIpMasking": false,
-              "ImmediatePurgeDataOn30Days": false
+              "ImmediatePurgeDataOn30Days": false,
+              "IngestionMode": "ApplicationInsights"
             }
           }
         ],

diff --git a/...-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsListByResourceGroup.json b/...-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsListByResourceGroup.json
@@ -31,7 +31,8 @@
               "RetentionInDays": 90,
               "ConnectionString": "InstrumentationKey=dc5931c7-a7ad-4ad0-89d6-123456789abc",
               "DisableIpMasking": false,
-              "ImmediatePurgeDataOn30Days": false
+              "ImmediatePurgeDataOn30Days": false,
+              "IngestionMode": "ApplicationInsights"
             }
           },
           {
@@ -57,7 +58,8 @@
               "RetentionInDays": 90,
               "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
               "DisableIpMasking": false,
-              "ImmediatePurgeDataOn30Days": false
+              "ImmediatePurgeDataOn30Days": false,
+              "IngestionMode": "ApplicationInsights"
             }
           }
         ],

diff --git a/...ghts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsUpdate.json b/...ghts/resource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsUpdate.json
@@ -41,7 +41,8 @@
           "RetentionInDays": 90,
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
-          "ImmediatePurgeDataOn30Days": false
+          "ImmediatePurgeDataOn30Days": false,
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }

diff --git a/...ource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsUpdateTagsOnly.json b/...ource-manager/Microsoft.Insights/stable/2015-05-01/examples/ComponentsUpdateTagsOnly.json
@@ -45,7 +45,8 @@
           "RetentionInDays": 90,
           "ConnectionString": "InstrumentationKey=bc095013-3cf2-45ac-ab47-123456789abc",
           "DisableIpMasking": false,
-          "ImmediatePurgeDataOn30Days": false
+          "ImmediatePurgeDataOn30Days": false,
+          "IngestionMode": "ApplicationInsights"
         }
       }
     }