Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix checks
  • Loading branch information
limingu committed Sep 29, 2020
commit c731af40b0babe1af0838c4a11668b96c9c84f0a
1 change: 1 addition & 0 deletions custom-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,7 @@ libtrust
lifecycle
lifetimejobstats
lifetimepoolstats
Liftr
Linestring
linkedservices
linkexpiryinminutes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@
"tags": [
"RefreshSetPasswordLink"
],
"summary": "Refresh the setpassword link and return a latest one.",
"summary": "Refresh the set password link and return a latest one.",
"operationId": "RefreshSetPassword_Get",
"produces": [
"application/json"
Expand Down Expand Up @@ -1264,6 +1264,10 @@
"description": {
"description": "Description of the operation, e.g., 'Write monitors'.",
"type": "string"
},
"isDataAction": {
"description": "Indicates whether the operation is a data action",
"type": "boolean"
}
}
},
Expand Down Expand Up @@ -1339,18 +1343,18 @@
"name": "MonitoringStatus"
}
},
"MarketplaceSubscriptionStatus": {
"description": "Flag specifying the Marketplace Subscription Status of the resource. If payment is not made in time, the resource will go in Suspended state.",
"enum": [
"Active",
"Suspended"
],
"type": "string",
"x-ms-enum": {
"modelAsString": true,
"name": "MarketplaceSubscriptionStatus"
}
},
"MarketplaceSubscriptionStatus": {
"description": "Flag specifying the Marketplace Subscription Status of the resource. If payment is not made in time, the resource will go in Suspended state.",
"enum": [
"Active",
"Suspended"
],
"type": "string",
"x-ms-enum": {
"modelAsString": true,
"name": "MarketplaceSubscriptionStatus"
}
},
"DatadogOrganizationProperties": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1429,9 +1433,9 @@
"monitoringStatus": {
"$ref": "#/definitions/MonitoringStatus"
},
"marketplaceSubscriptionStatus": {
"$ref": "#/definitions/MarketplaceSubscriptionStatus"
},
"marketplaceSubscriptionStatus": {
"$ref": "#/definitions/MarketplaceSubscriptionStatus"
},
"datadogOrganizationProperties": {
"$ref": "#/definitions/DatadogOrganizationProperties"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"installMethod": {
"tool": "install_script",
"toolVersion": "install_script",
"installVersion": "install_script-1.0.0"
"installerVersion": "install_script-1.0.0"
},
"logsAgent": {
"transport": ""
Expand All @@ -46,7 +46,7 @@
"installMethod": {
"tool": "install_script",
"toolVersion": "install_script",
"installVersion": "install_script-1.0.0"
"installerVersion": "install_script-1.0.0"
},
"logsAgent": {
"transport": "HTTP"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"datadogOrganizationProperties": {
"name": "myOrg",
"subscription": "pro",
"linkingAuthCode" : "someAuthCode",
"linkingAuthCode": "someAuthCode",
"linkingClientId": "00000000-0000-0000-0000-000000000000",
"enterpriseAppId": "00000000-0000-0000-0000-000000000000"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"requestBody": {
"properties": {
"singleSignOnState": "Enable",
"metadataXML": "<xml>some long string......</xml>",
"enterpriseAppId": "00000000-0000-0000-0000-000000000000"
}
}
Expand All @@ -20,7 +19,6 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Datadog/monitors/myMonitor/singleSignOnConfigurations/default",
"properties": {
"singleSignOnState": "Enable",
"metadataXML": null,
"enterpriseAppId": "00000000-0000-0000-0000-000000000000",
"singleSignOnUrl": null
}
Expand All @@ -32,7 +30,6 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Datadog/monitors/myMonitor/singleSignOnConfigurations/default",
"properties": {
"singleSignOnState": "Enable",
"metadataXML": null,
"enterpriseAppId": "00000000-0000-0000-0000-000000000000",
"singleSignOnUrl": null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Datadog/monitors/myMonitor/singleSignOnConfigurations/default",
"properties": {
"singleSignOnState": "Enable",
"metadataXML": null,
"enterpriseAppId": "00000000-0000-0000-0000-000000000000",
"singleSignOnUrl": "https://www.datadoghq.com/IAmSomeHash"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Datadog/monitors/myMonitor/singleSignOnConfigurations/default",
"properties": {
"singleSignOnState": "Enable",
"metadataXML": null,
"enterpriseAppId": "00000000-0000-0000-0000-000000000000",
"singleSignOnUrl": "https://www.datadoghq.com/IAmSomeHash"
}
Expand Down
8 changes: 4 additions & 4 deletions specification/datadog/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ These are the global settings for the Datadog API.
``` yaml
title: Microsoft Datadog Client
openapi-type: arm
tag: package-2020-02-01-preview
tag: package-2020-02-preview
```

### Tag: package-2020-02-01-preview
### Tag: package-2020-02-preview

These settings apply only when `--tag=package-2020-02-01-preview` is specified on the command line.
These settings apply only when `--tag=package-2020-02-preview` is specified on the command line.

``` yaml $(tag) == 'package-2020-02-01-preview'
``` yaml $(tag) == 'package-2020-02-preview'
input-file:
- Microsoft.Datadog/preview/2020-02-01-preview/datadog.json
```
Expand Down