You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/spring-apps/basic-standard/how-to-appdynamics-java-agent-monitor.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -44,7 +44,7 @@ For the whole workflow, you need to:
44
44
* Activate the AppDynamics Java in-process agent in Azure Spring Apps to generate application metrics data.
45
45
* Connect the AppDynamics Agent to the AppDynamics Controller to collect and visualize the data in the controller.
46
46
47
-
:::image type="content" source="media/how-to-appdynamics-java-agent-monitor/appdynamics-activation.jpg" alt-text="Diagram that shows a Spring Boot application in an Azure Spring Apps service instance." lightbox="media/how-to-appdynamics-java-agent-monitor/appdynamics-activation.jpg":::
47
+
:::image type="content" source="media/how-to-appdynamics-java-agent-monitor/appdynamics-activation.jpg" alt-text="Diagram that shows AppDynamics Agent with two-way arrow to Spring Boot Apps in Azure Spring Apps and arrow pointing to AppDynamics Agent." border="false":::
48
48
49
49
### Activate an application with the AppDynamics Agent using the Azure CLI
Copy file name to clipboardExpand all lines: articles/spring-apps/basic-standard/quickstart-logs-metrics-tracing.md
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -161,15 +161,15 @@ To get the logs using Azure Toolkit for IntelliJ:
161
161
162
162
1. Select **Streaming Logs** from the drop-down list.
163
163
164
-
:::image type="content" source="media/quickstart-logs-metrics-tracing/streaming-logs.png" alt-text="Screenshot of the Azure portal that shows the Streaming Logs option highlighted." lightbox="media/quickstart-logs-metrics-tracing/streaming-logs.png":::
164
+
:::image type="content" source="media/quickstart-logs-metrics-tracing/streaming-logs.png" alt-text="Screenshot of IntelliJ that shows the Azure Explorer pane with the context menu open and the Streaming Logs option highlighted." lightbox="media/quickstart-logs-metrics-tracing/streaming-logs.png":::
165
165
166
166
1. Select **Instance**.
167
167
168
-
:::image type="content" source="media/quickstart-logs-metrics-tracing/select-instance.png" alt-text="Screenshot of the Azure portal that shows the Select Instance option." lightbox="media/quickstart-logs-metrics-tracing/select-instance.png":::
168
+
:::image type="content" source="media/quickstart-logs-metrics-tracing/select-instance.png" alt-text="Screenshot of IntelliJ that shows the Select Instance dialog box." lightbox="media/quickstart-logs-metrics-tracing/select-instance.png":::
169
169
170
170
1. The streaming log is visible in the output window.
171
171
172
-
:::image type="content" source="media/quickstart-logs-metrics-tracing/streaming-log-output.png" alt-text="Screenshot of the Azure portal that shows the Streaming Log output window." lightbox="media/quickstart-logs-metrics-tracing/streaming-log-output.png":::
172
+
:::image type="content" source="media/quickstart-logs-metrics-tracing/streaming-log-output.png" alt-text="Screenshot of IntelliJ that shows the Azure Streaming Log pane." lightbox="media/quickstart-logs-metrics-tracing/streaming-log-output.png":::
173
173
174
174
To learn more about the query language that's used in Log Analytics, see [Azure Monitor log queries](/azure/data-explorer/kusto/query/). To query all your Log Analytics logs from a centralized client, check out [Azure Data Explorer](/azure/data-explorer/query-monitor-data).
Copy file name to clipboardExpand all lines: articles/spring-apps/enterprise/concepts-blue-green-deployment-strategies.md
+10-10Lines changed: 10 additions & 10 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -30,27 +30,27 @@ Suppose your application has two deployments: `deployment1` and `deployment2`. C
30
30
31
31
This makes `deployment2` the staging deployment. Thus, when the Continuous Delivery (CD) pipeline is ready to run, it deploys the next version of the app, version `v4`, onto the staging deployment `deployment2`.
32
32
33
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-1.png" alt-text="Diagram that shows deployment1 receiving production traffic." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-1.png":::
33
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-1.png" alt-text="Diagram that shows deployment1 with v3 receiving production traffic and deployment2 staging v4." border="false":::
34
34
35
35
After `v4` has started up on `deployment2`, you can run automated and manual tests against it through a private test endpoint to ensure `v4` meets all expectations.
36
36
37
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-2.png" alt-text="Diagram that shows V4 deployed on deployment2 and undergoing testing." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-2.png":::
37
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-2.png" alt-text="Diagram that shows V4 deployed on deployment2 and undergoing testing." border="false":::
38
38
39
39
When you have confidence in `v4`, you can set `deployment2` as the production deployment so that it receives all production traffic. `v3` will remain running on `deployment1` in case you discover a critical issue that requires rolling back.
40
40
41
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-3.png" alt-text="Diagram that shows V4 on deployment2 receiving production traffic." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-3.png":::
41
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-3.png" alt-text="Diagram that shows V4 on deployment2 receiving production traffic." border="false":::
42
42
43
43
Now, `deployment1` is the staging deployment. So the next run of the deployment pipeline deploys onto `deployment1`.
44
44
45
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-4.png" alt-text="Diagram that shows V5 deployed on deployment1." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-4.png":::
45
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-4.png" alt-text="Diagram that shows V5 staged to deployment1." border="false":::
46
46
47
47
You can now test `V5` on `deployment1`'s private test endpoint.
48
48
49
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-5.png" alt-text="Diagram that shows V5 tested on deployment1." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-5.png":::
49
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-5.png" alt-text="Diagram that shows V5 tested on deployment1." border="false":::
50
50
51
51
Finally, after `v5` meets all your expectations, you set `deployment1` as the production deployment once again, so that `v5` receives all production traffic.
52
52
53
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-6.png" alt-text="Diagram that shows V5 receiving traffic on deployment1." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-6.png":::
53
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-6.png" alt-text="Diagram that shows V5 receiving production traffic on deployment1." border="false":::
54
54
55
55
### Tradeoffs of the alternating deployments approach
56
56
@@ -64,7 +64,7 @@ The staging deployment always remains running, and thus consuming resources of t
64
64
65
65
Suppose in the above application, the release pipeline requires manual approval before each new version of the application can receive production traffic. This creates the risk that while one version (`v6`) awaits manual approval on the staging deployment, the deployment pipeline will run again and overwrite it with a newer version (`v7`). Then, when the approval for `v6` is granted, the pipeline that deployed `v6` will set the staging deployment as production. But now it will be the unapproved `v7`, not the approved `v6`, that is deployed on that deployment and receives traffic.
66
66
67
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-race-condition.png" alt-text="Diagram that shows the approval race condition." lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-race-condition.png":::
67
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/alternating-deployments-race-condition.png" alt-text="Diagram that shows the approval race condition described in this section." border="false" lightbox="media/concepts-blue-green-deployment-strategies/alternating-deployments-race-condition.png":::
68
68
69
69
You may be able to prevent the race condition by ensuring that the deployment flow for one version can't begin until the deployment flow for all previous versions is complete or aborted. Another way to prevent the approval race condition is to use the Named Deployments approach described below.
70
70
@@ -74,15 +74,15 @@ In the named deployments approach, a new deployment is created for each new vers
74
74
75
75
In the illustration below, version `v5` is running on the deployment `deployment-v5`. The deployment name now contains the version because the deployment was created specifically for this version. There's no other deployment at the outset. Now, to deploy version `v6`, the deployment pipeline creates a new deployment `deployment-v6` and deploys app version `v6` there.
76
76
77
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-1.png" alt-text="Diagram that shows deployment of a new version on a named deployment." lightbox="media/concepts-blue-green-deployment-strategies/named-deployment-1.png":::
77
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-1.png" alt-text="Diagram that shows deployment of a new version on a named deployment as described in this section." border="false" lightbox="media/concepts-blue-green-deployment-strategies/named-deployment-1.png":::
78
78
79
79
There's no risk of another version being deployed in parallel. First, Azure Spring Apps doesn't allow the creation of a third deployment while two deployments already exist. Second, even if it was possible to have more than two deployments, each deployment is identified by the version of the application it contains. Thus, the pipeline orchestrating the deployment of `v6` would only attempt to set `deployment-v6` as the production deployment.
80
80
81
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-2.png" alt-text="Diagram that shows a new version receiving production traffic named deployment." lightbox="media/concepts-blue-green-deployment-strategies/named-deployment-2.png":::
81
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-2.png" alt-text="Diagram that shows v6 deployed to deployment-v6 and receiving production traffic." border="false":::
82
82
83
83
After the deployment created for the new version receives production traffic, you'll need to remove the deployment containing the previous version to make room for future deployments. You may wish to postpone by some number of minutes or hours so you can roll back to the previous version if you discover a critical issue in the new version.
84
84
85
-
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-3.png" alt-text="Diagram that shows that after a fallback period, the previous deployment is deleted." lightbox="media/concepts-blue-green-deployment-strategies/named-deployment-3.png":::
85
+
:::image type="content" source="media/concepts-blue-green-deployment-strategies/named-deployment-3.png" alt-text="Diagram that shows that, after a fallback period, the previous deployment is deleted." border="false":::
Copy file name to clipboardExpand all lines: articles/spring-apps/enterprise/github-actions-key-vault.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -56,11 +56,11 @@ The credential you created above can get only general information about the Key
56
56
57
57
Go to the **Key Vault** dashboard in Azure portal, select the **Access control** menu, then open the **Role assignments** tab. Select **Apps** for **Type** and `This resource` for **scope**. You should see the credential you created in previous step:
58
58
59
-
:::image type="content" source="media/github-actions-key-vault/key-vault1.png" alt-text="Screenshot of the Azure portal that shows the Access control page with the Role assignments highlighted." lightbox="media/github-actions-key-vault/key-vault1.png":::
59
+
:::image type="content" source="media/github-actions-key-vault/key-vault1.png" alt-text="Screenshot of the Azure portal that shows the Access control page with the Role assignments tab highlighted." lightbox="media/github-actions-key-vault/key-vault1.png":::
60
60
61
61
Copy the credential name, for example, `azure-cli-2020-01-19-04-39-02`. Open the **Access policies** menu, then select the **Add Access Policy** link. Select `Secret Management` for **Template**, then select **Principal**. Paste the credential name in **Principal**/**Select** input box:
62
62
63
-
:::image type="content" source="media/github-actions-key-vault/key-vault2.png" alt-text="Screenshot of the Azure portal that shows the Add access policies page." lightbox="media/github-actions-key-vault/key-vault2.png":::
63
+
:::image type="content" source="media/github-actions-key-vault/key-vault2.png" alt-text="Screenshot of the Azure portal that shows the Add access policy page with the Principal pane open." lightbox="media/github-actions-key-vault/key-vault2.png":::
64
64
65
65
Select the **Add** button in the **Add access policy** dialog, then select **Save**.
Copy file name to clipboardExpand all lines: articles/spring-apps/enterprise/how-to-circuit-breaker-metrics.md
+3-2Lines changed: 3 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -216,7 +216,8 @@ Use the following steps to build and deploy the sample applications.
216
216
217
217
1. Set **Metric** to **resilience4j_circuitbreaker_calls**, and then set **Aggregation** to **Avg**. Select **Add metric** and set **Metric** to **resilience4j_circuitbreaker_buffered_calls**, and then set **Aggregation** to **Avg**. Select **Add metric** again and set **Metric** to **resilience4j_circuitbreaker_slow_calls**, and then set **Aggregation** set to **Avg**.
218
218
219
-
:::image type="content" source="media/how-to-circuit-breaker-metrics/slow-calls.png" alt-text="Screenshot of the Azure portal that shows the Application Insights Metrics page with a chart as mentioned in the process step." lightbox="media/how-to-circuit-breaker-metrics/slow-calls.png":::
219
+
:::image type="content" source="media/how-to-circuit-breaker-metrics/slow-calls.png" alt-text="Screenshot of the Azure portal that shows the Application Insights Metrics page with the chart described in this step." lightbox="media/how-to-circuit-breaker-metrics/slow-calls.png":::
220
+
220
221
221
222
::: zone-end
222
223
@@ -253,7 +254,7 @@ Use the following steps to build and deploy the sample applications.
253
254
254
255
1. Set **Metric** to **resilience4j_circuitbreaker_calls**, and then set **Aggregation** to **Avg**. Select **Add metric** and set **Metric** to **resilience4j_circuitbreaker_buffered_calls**, and then set **Aggregation** to **Avg**. Select **Add metric** again and set **Metric** to **resilience4j_circuitbreaker_slow_calls**, and then set **Aggregation** set to **Avg**.
255
256
256
-
:::image type="content" source="media/how-to-circuit-breaker-metrics/slow-calls.png" alt-text="Screenshot of the Azure portal that shows the Application Insights Metrics page with a chart as mentioned in the process step." lightbox="media/how-to-circuit-breaker-metrics/slow-calls.png":::
257
+
:::image type="content" source="media/how-to-circuit-breaker-metrics/slow-calls.png" alt-text="Screenshot of the Azure portal that shows the Application Insights Metrics page with the chart described in this step." lightbox="media/how-to-circuit-breaker-metrics/slow-calls.png":::
Copy file name to clipboardExpand all lines: articles/spring-apps/enterprise/how-to-permissions.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -67,7 +67,7 @@ The Developer role includes permissions to restart apps and see their log stream
67
67
68
68
1. In the search box, search for **Microsoft.app**. Select **Microsoft Azure Spring Apps**:
69
69
70
-
:::image type="content" source="media/how-to-permissions/permissions.png" alt-text="Screenshot of the Azure portal that shows the search results page." lightbox="media/how-to-permissions/permissions.png":::
70
+
:::image type="content" source="media/how-to-permissions/permissions.png" alt-text="Screenshot of the Azure portal that shows the Add permissions page search results with Microsoft Azure Spring Apps highlighted." lightbox="media/how-to-permissions/permissions.png":::
0 commit comments