[Hub Generated] Review request for Microsoft.Security to add version …

…preview/2017-08-01-preview (Azure#6280) * Resource management * updated examples * Split userdefinedresourcest to separate type * Optionals in patch * use properties * updated patch example * moved parameter to separate section * updated patch parameters * removed mistake file * removed copy example json * Added recommendation configuration in the Solution Manager RP * removed the required section in RecommendationConfigurationProperties * fixed examples of Solution Manager RP * changed RecommendationConfigurationProperties in Solution Manager RP * Ran jsonfmt -w specification/security/**/*.json * changed name of property in iot solution RP * fixed examples of Iot Solution RP
chidozieononiwu · Jun 14, 2019 · 37bde75 · 37bde75
1 parent e59d836
commit 37bde75
Show file tree

Hide file tree

Showing 9 changed files with 609 additions and 14 deletions.
diff --git a/...w/2017-08-01-preview/examples/IoTSecuritySolutions/CreateIoTSecuritySolution_example.json b/...w/2017-08-01-preview/examples/IoTSecuritySolutions/CreateIoTSecuritySolution_example.json
@@ -15,7 +15,13 @@
         "displayName": "Solution Default",
         "iotHubs": [
           "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
-        ]
+        ],
+        "userDefinedResources": {
+          "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+          "querySubscriptions": [
+            "075423e9-7d33-4166-8bdf-3920b04e3735"
+          ]
+        }
       }
     }
   },
@@ -35,6 +41,16 @@
           "displayName": "Solution Default",
           "iotHubs": [
             "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+          ],
+          "userDefinedResources": {
+            "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+            "querySubscriptions": [
+              "075423e9-7d33-4166-8bdf-3920b04e3735"
+            ]
+          },
+          "autoDiscoveredResources": [
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
           ]
         }
       }
@@ -54,6 +70,26 @@
           "displayName": "Solution Default",
           "iotHubs": [
             "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+          ],
+          "userDefinedResources": {
+            "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+            "querySubscriptions": [
+              "075423e9-7d33-4166-8bdf-3920b04e3735"
+            ]
+          },
+          "autoDiscoveredResources": [
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+          ],
+          "recommendationsConfiguration": [
+            {
+              "recommendationType": "OpenPortsOnDevice",
+              "status": "TurnedOff"
+            },
+            {
+              "recommendationType": "IdenticalAuthenticationCredentials",
+              "status": "TurnedOff"
+            }
           ]
         }
       }

diff --git a/...view/2017-08-01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolution_example.json b/...view/2017-08-01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolution_example.json
@@ -21,6 +21,78 @@
           "displayName": "Solution Default",
           "iotHubs": [
             "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+          ],
+          "userDefinedResources": {
+            "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+            "querySubscriptions": [
+              "075423e9-7d33-4166-8bdf-3920b04e3735"
+            ]
+          },
+          "autoDiscoveredResources": [
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+            "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+          ],
+          "recommendationsConfiguration": [
+            {
+              "recommendationType": "OpenPortsOnDevice",
+              "description": "Open Ports on device",
+              "status": "TurnedOff"
+            },
+            {
+              "recommendationType": "PermissiveFirewallPolicy",
+              "description": "Permissive firewall policy found in one of the chains",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "PermissiveFirewallRuleInput",
+              "description": "Permissive firewall rule in the input chain was found",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "PermissiveFirewallRuleOut",
+              "description": "Permissive firewall rule in the output chain was found",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "OperationSystemNotValid",
+              "description": "Operation system baseline validation has failed",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "UnutilizedMessagesFromAgent",
+              "description": "Agent sends unutilized messages",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "SecurityTwinConfigurationNotOptimal",
+              "description": "Security twin configuration not optimal",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "SecurityTwinConfigurationConflict",
+              "description": "Security twin configuration conflict",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "IdenticalAuthenticationCredentials",
+              "description": "Identical authentication credentials used by multiple devices",
+              "status": "TurnedOff"
+            },
+            {
+              "recommendationType": "DenyDefaultIpPolicy",
+              "description": "Default IP filter policy should be deny",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "TooLargeIPRange",
+              "description": "IP filter rule includes large IP range",
+              "status": "TurnedOn"
+            },
+            {
+              "recommendationType": "EnableDiagnosticsLog",
+              "description": "Enable diagnostics logs in IoT Hub",
+              "status": "TurnedOn"
+            }
           ]
         }
       }

diff --git a/...eview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByIotHubAndRg_example.json b/...eview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByIotHubAndRg_example.json
@@ -25,6 +25,78 @@
               "displayName": "Solution Default",
               "iotHubs": [
                 "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "userDefinedResources": {
+                "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+                "querySubscriptions": [
+                  "075423e9-7d33-4166-8bdf-3920b04e3735"
+                ]
+              },
+              "autoDiscoveredResources": [
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "recommendationsConfiguration": [
+                {
+                  "recommendationType": "OpenPortsOnDevice",
+                  "description": "Open Ports on device",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallPolicy",
+                  "description": "Permissive firewall policy found in one of the chains",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleInput",
+                  "description": "Permissive firewall rule in the input chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleOut",
+                  "description": "Permissive firewall rule in the output chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "OperationSystemNotValid",
+                  "description": "Operation system baseline validation has failed",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "UnutilizedMessagesFromAgent",
+                  "description": "Agent sends unutilized messages",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationNotOptimal",
+                  "description": "Security twin configuration not optimal",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationConflict",
+                  "description": "Security twin configuration conflict",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "IdenticalAuthenticationCredentials",
+                  "description": "Identical authentication credentials used by multiple devices",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "DenyDefaultIpPolicy",
+                  "description": "Default IP filter policy should be deny",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "TooLargeIPRange",
+                  "description": "IP filter rule includes large IP range",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "EnableDiagnosticsLog",
+                  "description": "Enable diagnostics logs in IoT Hub",
+                  "status": "TurnedOn"
+                }
               ]
             }
           }

diff --git a/...01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByIotHub_example.json b/...01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByIotHub_example.json
@@ -24,6 +24,78 @@
               "displayName": "Solution Default",
               "iotHubs": [
                 "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "userDefinedResources": {
+                "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+                "querySubscriptions": [
+                  "075423e9-7d33-4166-8bdf-3920b04e3735"
+                ]
+              },
+              "autoDiscoveredResources": [
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "recommendationsConfiguration": [
+                {
+                  "recommendationType": "OpenPortsOnDevice",
+                  "description": "Open Ports on device",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallPolicy",
+                  "description": "Permissive firewall policy found in one of the chains",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleInput",
+                  "description": "Permissive firewall rule in the input chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleOut",
+                  "description": "Permissive firewall rule in the output chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "OperationSystemNotValid",
+                  "description": "Operation system baseline validation has failed",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "UnutilizedMessagesFromAgent",
+                  "description": "Agent sends unutilized messages",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationNotOptimal",
+                  "description": "Security twin configuration not optimal",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationConflict",
+                  "description": "Security twin configuration conflict",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "IdenticalAuthenticationCredentials",
+                  "description": "Identical authentication credentials used by multiple devices",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "DenyDefaultIpPolicy",
+                  "description": "Default IP filter policy should be deny",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "TooLargeIPRange",
+                  "description": "IP filter rule includes large IP range",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "EnableDiagnosticsLog",
+                  "description": "Enable diagnostics logs in IoT Hub",
+                  "status": "TurnedOn"
+                }
               ]
             }
           }

diff --git a/...-08-01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByRg_example.json b/...-08-01-preview/examples/IoTSecuritySolutions/GetIoTSecuritySolutionsListByRg_example.json
@@ -22,6 +22,78 @@
               "displayName": "Solution Default",
               "iotHubs": [
                 "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "userDefinedResources": {
+                "query": "where type != \"microsoft.devices/iothubs\" | where name contains \"iot\"",
+                "querySubscriptions": [
+                  "075423e9-7d33-4166-8bdf-3920b04e3735"
+                ]
+              },
+              "autoDiscoveredResources": [
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735",
+                "/subscriptions/075423e9-7d33-4166-8bdf-3920b04e3735/resourceGroups/myRg/providers/Microsoft.Devices/IotHubs/FirstIotHub"
+              ],
+              "recommendationsConfiguration": [
+                {
+                  "recommendationType": "OpenPortsOnDevice",
+                  "description": "Open Ports on device",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallPolicy",
+                  "description": "Permissive firewall policy found in one of the chains",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleInput",
+                  "description": "Permissive firewall rule in the input chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "PermissiveFirewallRuleOut",
+                  "description": "Permissive firewall rule in the output chain was found",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "OperationSystemNotValid",
+                  "description": "Operation system baseline validation has failed",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "UnutilizedMessagesFromAgent",
+                  "description": "Agent sends unutilized messages",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationNotOptimal",
+                  "description": "Security twin configuration not optimal",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "SecurityTwinConfigurationConflict",
+                  "description": "Security twin configuration conflict",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "IdenticalAuthenticationCredentials",
+                  "description": "Identical authentication credentials used by multiple devices",
+                  "status": "TurnedOff"
+                },
+                {
+                  "recommendationType": "DenyDefaultIpPolicy",
+                  "description": "Default IP filter policy should be deny",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "TooLargeIPRange",
+                  "description": "IP filter rule includes large IP range",
+                  "status": "TurnedOn"
+                },
+                {
+                  "recommendationType": "EnableDiagnosticsLog",
+                  "description": "Enable diagnostics logs in IoT Hub",
+                  "status": "TurnedOn"
+                }
               ]
             }
           }