Skip to content

Commit 6c83fee

Browse files
author
David Curwin
committed
fix conflict
2 parents 19b6213 + 5069866 commit 6c83fee

File tree

537 files changed

+40533
-42822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

537 files changed

+40533
-42822
lines changed

‎.openpublishing.publish.config.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,12 +998,36 @@
998998
"branch": "main",
999999
"branch_mapping": {}
10001000
},
1001+
{
1002+
"path_to_root": "cosmos-db-nosql-nodejs-quickstart",
1003+
"url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
10011007
{
10021008
"path_to_root": "cosmos-db-nosql-python-samples",
10031009
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
10041010
"branch": "main",
10051011
"branch_mapping": {}
10061012
},
1013+
{
1014+
"path_to_root": "cosmos-db-nosql-python-quickstart",
1015+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
1019+
{
1020+
"path_to_root": "cosmos-db-nosql-java-quickstart",
1021+
"url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
1022+
"branch": "main",
1023+
"branch_mapping": {}
1024+
},
1025+
{
1026+
"path_to_root": "cosmos-db-nosql-go-quickstart",
1027+
"url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
1028+
"branch": "main",
1029+
"branch_mapping": {}
1030+
},
10071031
{
10081032
"path_to_root": "cosmos-db-mongodb-dotnet-samples",
10091033
"url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",

‎.openpublishing.redirection.active-directory.json

Lines changed: 33248 additions & 32724 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 112 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,11 @@
430430
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
431431
"redirect_document_id": false
432432
},
433+
{
434+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks.md",
435+
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks",
436+
"redirect_document_id": false
437+
},
433438
{
434439
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversions.md",
435440
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversions",
@@ -702,7 +707,7 @@
702707
},
703708
{
704709
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-transition-hybrid.md",
705-
"redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
710+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
706711
"redirect_document_id": false
707712
},
708713
{
@@ -1697,17 +1702,22 @@
16971702
},
16981703
{
16991704
"source_path_from_root": "/articles/monitoring/monitoring-container-insights-onboard.md",
1700-
"redirect_url": "/azure/azure-monitor/insights/container-insights-onboard",
1705+
"redirect_url": "/azure/azure-monitor/insights/kubernetes-monitoring-enable",
1706+
"redirect_document_id": false
1707+
},
1708+
{
1709+
"source_path_from_root": "/articles/containers/container-insights-enable-provisioned-clusters.md",
1710+
"redirect_url": "/azure/azure-monitor/insights/kubernetes-monitoring-enable",
17011711
"redirect_document_id": false
17021712
},
17031713
{
17041714
"source_path_from_root": "/articles/monitoring/monitoring-container-insights-optout.md",
1705-
"redirect_url": "/azure/azure-monitor/insights/container-insights-optout",
1715+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
17061716
"redirect_document_id": false
17071717
},
17081718
{
17091719
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift.md",
1710-
"redirect_url": "/azure/azure-monitor/insights/container-insights-optout-openshift-v3",
1720+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
17111721
"redirect_document_id": false
17121722
},
17131723
{
@@ -4736,7 +4746,12 @@
47364746
},
47374747
{
47384748
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-agent-config.md",
4739-
"redirect_url": "/azure/azure-monitor/containers/container-insights-agent-config",
4749+
"redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-configmap",
4750+
"redirect_document_id": false
4751+
},
4752+
{
4753+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-agent-config.md",
4754+
"redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-configmap",
47404755
"redirect_document_id": false
47414756
},
47424757
{
@@ -4779,6 +4794,16 @@
47794794
"redirect_url": "/azure/azure-monitor/containers/container-insights-enable-new-cluster",
47804795
"redirect_document_id": false
47814796
},
4797+
{
4798+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks.md",
4799+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
4800+
"redirect_document_id": false
4801+
},
4802+
{
4803+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-arc-enabled-clusters.md",
4804+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
4805+
"redirect_document_id": false
4806+
},
47824807
{
47834808
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-gpu-monitoring.md",
47844809
"redirect_url": "/azure/azure-monitor/containers/container-insights-gpu-monitoring",
@@ -4831,27 +4856,27 @@
48314856
},
48324857
{
48334858
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-onboard.md",
4834-
"redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
4859+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
48354860
"redirect_document_id": false
48364861
},
48374862
{
48384863
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout.md",
4839-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
4864+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
48404865
"redirect_document_id": false
48414866
},
48424867
{
48434868
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-hybrid.md",
4844-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout-hybrid",
4869+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
48454870
"redirect_document_id": false
48464871
},
48474872
{
48484873
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift-v3.md",
4849-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout-openshift-v3",
4874+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
48504875
"redirect_document_id": false
48514876
},
48524877
{
48534878
"source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift-v4.md",
4854-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout-openshift-v4",
4879+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
48554880
"redirect_document_id": false
48564881
},
48574882
{
@@ -4884,6 +4909,16 @@
48844909
"redirect_url": "/azure/azure-monitor/containers/container-insights-update-metrics",
48854910
"redirect_document_id": false
48864911
},
4912+
{
4913+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks-policy.md",
4914+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable&tabs=policy#enable-container-insights",
4915+
"redirect_document_id": false
4916+
},
4917+
{
4918+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-provisioned-clusters.md",
4919+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md&tabs=cli#aks-hybrid-cluster",
4920+
"redirect_document_id": false
4921+
},
48874922
{
48884923
"source_path_from_root": "/articles/azure-monitor/log-query/app-expression.md",
48894924
"redirect_url": "/azure/azure-monitor/logs/app-expression",
@@ -5711,7 +5746,7 @@
57115746
},
57125747
{
57135748
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
5714-
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
5749+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
57155750
"redirect_document_id": false
57165751
},
57175752
{
@@ -6056,7 +6091,7 @@
60566091
},
60576092
{
60586093
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-using-migration-tool.md",
6059-
"redirect_url": "previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
6094+
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
60606095
"redirect_document_id": false
60616096
},
60626097
{
@@ -6079,6 +6114,21 @@
60796114
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer-filters",
60806115
"redirect_document_id": false
60816116
},
6117+
{
6118+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-configurations.md",
6119+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-manage",
6120+
"redirect_document_id": false
6121+
},
6122+
{
6123+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-getting-started.md",
6124+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
6125+
"redirect_document_id": false
6126+
},
6127+
{
6128+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-commonly-used-components.md",
6129+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-visualizations",
6130+
"redirect_document_id": false
6131+
},
60826132
{
60836133
"source_path_from_root": "/articles/azure-monitor/app/export-telemetry.md",
60846134
"redirect_url": "/previous-versions/azure/azure-monitor/app/export-telemetry",
@@ -6216,17 +6266,17 @@
62166266
},
62176267
{
62186268
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus.md",
6219-
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6269+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
62206270
"redirect_document_id": false
62216271
},
62226272
{
62236273
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-enable.md",
6224-
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
6274+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md#enable-prometheus-and-grafana",
62256275
"redirect_document_id": false
62266276
},
62276277
{
62286278
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-disable.md",
6229-
"redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-disable",
6279+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
62306280
"redirect_document_id": false
62316281
},
62326282
{
@@ -6299,6 +6349,21 @@
62996349
"redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
63006350
"redirect_document_id": false
63016351
},
6352+
{
6353+
"source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-disable.md",
6354+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
6355+
"redirect_document_id": false
6356+
},
6357+
{
6358+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-logging-v2.md",
6359+
"redirect_url": "/azure/azure-monitor/containers/container-insights-logs-schema",
6360+
"redirect_document_id": false
6361+
},
6362+
{
6363+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-onboard.md",
6364+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
6365+
"redirect_document_id": false
6366+
},
63026367
{
63036368
"source_path_from_root": "/articles/azure-monitor/azure-cli-metrics-alert-sample.md",
63046369
"redirect_url": "/azure/azure-monitor/alerts/azure-cli-metrics-alert-sample",
@@ -6329,14 +6394,44 @@
63296394
"redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
63306395
"redirect_document_id": false
63316396
},
6397+
{
6398+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout.md",
6399+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
6400+
"redirect_document_id": false
6401+
},
63326402
{
63336403
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
6334-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6404+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
63356405
"redirect_document_id": false
63366406
},
63376407
{
63386408
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
6339-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6409+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
6410+
"redirect_document_id": false
6411+
},
6412+
{
6413+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-cost-config.md",
6414+
"redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-dcr",
6415+
"redirect_document_id": false
6416+
},
6417+
{
6418+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
6419+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
6420+
"redirect_document_id": false
6421+
},
6422+
{
6423+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-v2-migration.md",
6424+
"redirect_url": "/azure/azure-monitor/containers/container-insights-logs-schema",
6425+
"redirect_document_id": false
6426+
},
6427+
{
6428+
"source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-enable.md",
6429+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable#enable-prometheus-and-grafana",
6430+
"redirect_document_id": false
6431+
},
6432+
{
6433+
"source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster.md",
6434+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
63406435
"redirect_document_id": false
63416436
},
63426437
{

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,11 @@
914914
"source_path_from_root": "/articles/defender-for-cloud/tutorial-security-incident.md",
915915
"redirect_url": "/azure/defender-for-cloud/managing-and-responding-alerts",
916916
"redirect_document_id": true
917+
},
918+
{
919+
"source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
920+
"redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",
921+
"redirect_document_id": true
917922
}
918923
]
919924
}

0 commit comments

Comments
 (0)