Skip to content

Commit 8e2929f

Browse files
Suraiya-Hameedamirschwtomkerkhove
authored
feat: add docs for custom Azure cloud support (#69)
Co-authored-by: amirschw <[email protected]> Co-authored-by: Tom Kerkhove <[email protected]>
1 parent 9bcece1 commit 8e2929f

File tree

5 files changed

+47
-13
lines changed

5 files changed

+47
-13
lines changed

docs/faq.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ We have it on [our backlog](https://github.com/tomkerkhove/promitor/issues/761)
5454

5555
## What Azure clouds are supported?
5656

57-
We support `Global` (default), `China`, `UsGov` & `Germany` Azure clouds.
57+
We support `Global` (default), `China`, `UsGov`, `Germany` & `Custom` Azure clouds.
5858

59-
This can be configured in the metric configuration under `azureMetadata`.
59+
This can be configured in the metric configuration under `azureMetadata` and in resource discovery configuration under `azureLandscape`
6060

61-
For more information see our ['Metric Configuration' page](scraping/overview.md).
61+
For more information see our ['Metric Configuration' page](scraping/overview.md) and [`Resource Discovery` page](resource-discovery/declaring-resource-discovery-groups.md).
6262

6363
## Why does Azure Blob & File Storage only report account-level information?
6464

docs/resource-discovery/declaring-resource-discovery-groups.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ As part of the resource discovery group declaration, you can choose to filter re
1515
with which the resources have to be annotated.
1616
- **Regions** - Defines a list of Azure regions in which the regions the resources are located.
1717

18-
Here is an example of a full declaration:
18+
Here is an example of a full declaration using a custom cloud:
1919

2020
```yaml
2121
version: v1
@@ -25,7 +25,14 @@ azureLandscape:
2525
- SUBSCRIPTON-ID-ABC
2626
- SUBSCRIPTON-ID-DEF
2727
- SUBSCRIPTON-ID-GHI
28-
cloud: China
28+
cloud: Custom
29+
endpoints:
30+
authenticationEndpoint: https://custom-authentication-endpoint
31+
managementEndpoint: https://custom-management-endpoint
32+
resourceManagerEndpoint: https://custom-resource-manager-endpoint
33+
graphEndpoint: https://custom-graph-endpoint
34+
storageEndpointSuffix: custom-storage-endpoint-suffix
35+
keyVaultSuffix: custom-key-vault-suffix
2936
resourceDiscoveryGroups:
3037
- name: container-registry-landscape
3138
type: ContainerRegistry
@@ -58,7 +65,15 @@ values are `v1`. *(Required)*
5865

5966
- `azureLandscape.tenantId` - The id of the Azure tenant that will be queried. *(Required)*
6067
- `azureLandscape.subscriptions` - List of Azure subscriptions in the Azure tenant to discover resources in. *(Required)*
61-
- `azureLandscape.cloud` - The name of the Azure cloud to use. Options are `Global` (default), `China`, `UsGov` & `Germany`.
68+
- `azureLandscape.cloud` - The name of the Azure cloud to use. Options are `Global`
69+
(default), `China`, `UsGov`, `Germany`, & `Custom`.
70+
- `azureLandscape.endpoints` - Required when `azureLandscape.cloud` is set to `Custom`. Defines the custom endpoints to use:
71+
- `authenticationEndpoint` - The custom authentication endpoint.
72+
- `managementEndpoint` - The custom service management endpoint.
73+
- `resourceManagerEndpoint` - The custom Azure ARM resource management endpoint.
74+
- `graphEndpoint` - The custom Active Directory graph endpoint.
75+
- `storageEndpointSuffix` - The custom storage service url suffix.
76+
- `keyVaultSuffix` - The custom Key Vault service url suffix.
6277

6378
### Resource Discovery Groups
6479

docs/scraping/overview.md

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,17 @@ values are `v1`. *(Required)*
7575
- `azureMetadata.subscriptionId` - The id of the default subscription to query.
7676
- `azureMetadata.resourceGroupName` - The name of the default resource group to query.
7777
- `azureMetadata.cloud` - The name of the Azure cloud to use. Options are `Global`
78-
(default), `China`, `UsGov` & `Germany`.
78+
(default), `China`, `UsGov`, `Germany`, & `Custom`.
79+
- `azureMetadata.endpoints` - Required when `azureMetadata.cloud` is set to `Custom`. Defines the custom endpoints to use:
80+
- `authenticationEndpoint` - The custom authentication endpoint.
81+
- `managementEndpoint` - The custom service management endpoint.
82+
- `resourceManagerEndpoint` - The custom Azure ARM resource management endpoint.
83+
- `graphEndpoint` - The custom Active Directory graph endpoint.
84+
- `storageEndpointSuffix` - The custom storage service url suffix.
85+
- `keyVaultSuffix` - The custom Key Vault service url suffix.
86+
- `metricsQueryAudience` - The custom audiences available for metrics query.
87+
- `metricsClientAudience` - The custom audiences available for metrics client.
88+
- `logAnalyticsEndpoint` - The custom log analytics endpoint. *(Required only if Azure Log Analytics resource is configured for scraping)*
7989

8090
### Metric Defaults
8191

@@ -130,17 +140,26 @@ Additionally, the following fields are optional:
130140

131141
### Example
132142

133-
Here is an example of how you can scrape two Azure Service Bus queues in different
143+
Here is an example of how you can scrape two Azure Service Bus queues in different
134144
resource groups, one in the `promitor` resource group and one on the `promitor-dev`
135-
resource group:
145+
resource group. This example also shows custom cloud endpoints configuration:
136146

137147
```yaml
138148
version: v1
139149
azureMetadata:
140150
tenantId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
141151
subscriptionId: yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy
142152
resourceGroupName: promitor
143-
cloud: China
153+
cloud: Custom
154+
endpoints:
155+
authenticationEndpoint: https://custom.auth.endpoint.com
156+
managementEndpoint: https://custom.svc.management.endpoint.com
157+
resourceManagerEndpoint: https://custom.resource.management.endpoint.com
158+
graphEndpoint: https://custom.graph.endpoint.com
159+
storageEndpointSuffix: custom.windows.net
160+
keyVaultSuffix: custom.vault.azure.net
161+
metricsQueryAudience: https://custom.metric.query.endpoint.com
162+
metricsClientAudience: https://custom.metric.client.endpoint.com
144163
metricDefaults:
145164
aggregation:
146165
interval: 00:05:00

docs/tags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Following is a list of relevant tags:
44

5-
[TAGS]
5+
<!-- material/tags -->

mkdocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ plugins:
6868
- mike:
6969
version_selector: true # set to false to leave out the version selector
7070
- search
71-
- tags:
72-
tags_file: tags.md
71+
- tags
7372
- htmlproofer:
7473
enabled: True
7574
raise_error: True
@@ -78,6 +77,7 @@ plugins:
7877
404: ['https://www.nuget.org/packages/NetEscapades.Configuration.Yaml'] # No idea why this is failing, but it is.
7978
405: ['*']
8079
520: ['*']
80+
403: ['https://www.mend.io/free-developer-tools/blog/overcoming-dockers-mutable-image-tags/']
8181

8282
# Customization
8383
extra:

0 commit comments

Comments
 (0)