Skip to content

Commit f9922c3

Browse files
Merge remote-tracking branch 'upstream/development' into development
2 parents 3d7ec58 + 012b05e commit f9922c3

41 files changed

Lines changed: 169 additions & 103 deletions

File tree

Some content is hidden

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

content/en/docs/academy/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,3 @@ Refer to the following pages for details on Mendix Academy exams:
4444
* [Purchasing Mendix Exam Seats](/academy/purchasing-exams/)
4545
* [Managing Exam Seats](/academy/purchasing-exams/manage-exam-seats/)
4646
* [Managing Exam Admins](/academy/purchasing-exams/manage-exam-admins/)
47-

content/en/docs/apidocs-mxsdk/apidocs/studio-pro-11/pluggable-widgets/pluggable-widgets-property-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,11 @@ The user can use the optional attribute [`allowUpload`](#allow-upload) with defa
277277

278278
#### XML Attributes
279279

280-
| Attribute | Required | Attribute Type | Description |
280+
| Attribute | Required | Attribute Type | Description |
281281
|---------------|----------|----------------|-----------------------------------------------------------------------|
282-
| `type` | Yes | String | Must be `image` |
283-
| `key` | Yes | String | See [key](#key) |
284-
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |
282+
| `type` | Yes | String | Must be `image` |
283+
| `key` | Yes | String | See [key](#key) |
284+
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |
285285
| `allowUpload` | No | Boolean | See [allowUpload](#allow-upload) |
286286

287287
#### Studio Pro UI

content/en/docs/control-center/entitlements/cloud-tokens.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,29 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
4646
| M21 | 40 |
4747
| L21 | 80 |
4848
| XL21 | 160 |
49-
| 2XL21 | 320 |
50-
| 3XL21 | 640 |
51-
| 4XL21 | 1280 |
52-
| 4XL-5XLDB | 2240 |
49+
| XXL21 | 320 |
50+
| XXXL21 | 640 |
51+
| XXXXL21 | 1280 |
52+
| XXXXL-5XLDB | 2240 |
5353

5454
|Premium Resource Packs | Mendix Cloud Tokens |
5555
| --- | --- |
5656
| S21 | 30 |
5757
| M21 | 60 |
5858
| L21 | 120 |
5959
| XL21 | 240 |
60-
| 2XL21 | 480 |
61-
| 3XL21 | 960 |
62-
| 4XL21 | 1920 |
63-
| 4XL-5XLDB | 3360 |
60+
| XXL21 | 480 |
61+
| XXXL21 | 960 |
62+
| XXXXL21 | 1920 |
63+
| XXXXL-5XLDB | 3360 |
6464

6565
|Premium Plus Resource Packs | Mendix Cloud Tokens |
6666
| --- | --: |
6767
| XL21 | 400 |
68-
| 2XL21 | 800 |
69-
| 3XL21 | 1600 |
70-
| 4XL21 | 3200 |
71-
| 4XL-5XLDB | 5600 |
68+
| XXL21 | 800 |
69+
| XXXL21 | 1600 |
70+
| XXXXL21 | 3200 |
71+
| XXXXL-5XLDB | 5600 |
7272

7373
| Legacy Resource Packs | Mendix Cloud Tokens |
7474
| --- | --: |
@@ -77,7 +77,7 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
7777
| M20 | 40 |
7878
| L20 | 80 |
7979
| XL20 | 160 |
80-
| 2XL20 | 320 |
80+
| XXL20 | 320 |
8181
| Strato | 12 |
8282
| Meso | 47 |
8383
| Iono | 67 |
@@ -86,8 +86,8 @@ These tables show how many Mendix Cloud Tokens each CRP requires:
8686
| M | 16 |
8787
| L | 37 |
8888
| XL | 73 |
89-
| 2XL | 167 |
90-
| 3XL | 640 |
89+
| XXL | 167 |
90+
| XXXL | 640 |
9191

9292
{{% alert color="info" %}}
9393

content/en/docs/deployment/mendix-cloud-deploy/_index.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ The technical details for the cloud resource packs are listed below.
173173

174174
| Pack | App RAM | App vCPU | DB RAM | DB vCPU | DB Storage | File Storage |
175175
| ---------------------------------------------------------------------- | ------- | -------- | ------- | ------- | ---------- | ------------ |
176-
| XS21 | 1 GiB | 0.25 | 1 GiB | 2 | 5 GiB | 10 GiB |
177-
| S21,<br>S21 Premium | 2 GiB | 0.5 | 2 GiB | 2 | 10 GiB | 20 GiB |
178-
| M21,<br>M21 Premium | 4 GiB | 1 | 4 GiB | 2 | 20 GiB | 40 GiB |
179-
| L21,<br>L21 Premium | 8 GiB | 2 | 8 GiB | 2 | 40 GiB | 80 GiB |
180-
| XL21,<br>XL21 Premium,<br>XL21 Premium Plus | 16 GiB | 4 | 16 GiB | 4 | 80 GiB | 160 GiB |
181-
| XXL21,<br>XXL21 Premium,<br>XXL21 Premium Plus | 32 GiB | 8 | 32 GiB | 4 | 160 GiB | 320 GiB |
182-
| XXXL21,<br>XXXL21 Premium,<br>XXXL21 Premium Plus | 64 GiB | 16 | 64 GiB | 8 | 320 GiB | 640 GiB |
183-
| XXXXL21,<br>XXXXL21 Premium,<br>XXXXL21 Premium Plus | 128 GiB | 32 | 128 GiB | 16 | 640 GiB | 1280 GiB |
184-
| XXXXL21-5XLDB,<br>XXXXL21-5XLDB Premium,<br>XXXXL21-5XLDB Premium Plus | 128 GiB | 32 | 256 GiB | 32 | 1280 GiB | 1280 GiB |
176+
| XS21 Standard | 1 GiB | 0.25 | 1 GiB | 2 | 5 GiB | 10 GiB |
177+
| S21 Standard,<br>S21 Premium | 2 GiB | 0.5 | 2 GiB | 2 | 10 GiB | 20 GiB |
178+
| M21 Standard,<br>M21 Premium | 4 GiB | 1 | 4 GiB | 2 | 20 GiB | 40 GiB |
179+
| L21 Standard,<br>L21 Premium | 8 GiB | 2 | 8 GiB | 2 | 40 GiB | 80 GiB |
180+
| XL21 Standard,<br>XL21 Premium,<br>XL21 Premium Plus | 16 GiB | 4 | 16 GiB | 4 | 80 GiB | 160 GiB |
181+
| XXL21 Standard,<br>XXL21 Premium,<br>XXL21 Premium Plus | 32 GiB | 8 | 32 GiB | 4 | 160 GiB | 320 GiB |
182+
| XXXL21 Standard,<br>XXXL21 Premium,<br>XXXL21 Premium Plus | 64 GiB | 16 | 64 GiB | 8 | 320 GiB | 640 GiB |
183+
| XXXXL21 Standard,<br>XXXXL21 Premium,<br>XXXXL21 Premium Plus | 128 GiB | 32 | 128 GiB | 16 | 640 GiB | 1280 GiB |
184+
| XXXXL21-5XLDB Standard,<br>XXXXL21-5XLDB Premium,<br>XXXXL21-5XLDB Premium Plus | 128 GiB | 32 | 256 GiB | 32 | 1280 GiB | 1280 GiB |
185185

186186
{{% alert color="info" %}}Premium plans provide multi-AZ fallback, and Premium Plus plans provide multi-region fallback. For more details, see [Additional Resources](#additional-resources), below.{{% /alert %}}
187187

content/en/docs/deployment/mendix-cloud-deploy/monitoring-application-health/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Database Freeable Memory | |
153153
Description | Track the amount of freeable memory for the database belonging to the application.
154154
Example message | Database has 35% freeable memory.
155155
Warning Threshold | Not used.
156-
Critical Threshold | Database has 5% freeable memory for XS21, XS20, S, and Strato [cloud resource packs](/developerportal/deploy/mendix-cloud-deploy/#resource-pack). Database has 10% freeable memory for all other cloud resource packs.
156+
Critical Threshold | Database has 5% freeable memory for XS21 Standard, XS20, S, and Strato [cloud resource packs](/developerportal/deploy/mendix-cloud-deploy/#resource-pack). Database has 10% freeable memory for all other cloud resource packs.
157157
First actions to take | Inspect the metrics graph **Database memory** for anomalies and correlate those with application behavior. Resolve by identifying and optimizing long-running database queries, or upgrading the cloud resource pack (for example, by ordering more memory).
158158

159159
### Database IOPS Burst Balance {#dbase-iops}

content/en/docs/deployment/mendix-cloud-deploy/monitoring-with-apm/splunk-metrics.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,11 @@ To send your runtime information to Splunk Cloud Platform, you need to set it up
4747
| `SPLUNK_ENABLE_METRICS` | Sends application metrics to Splunk when it's set to `true`. Disabled by default. A metrics index is also required, refer to the [metrics index information](#splunk-metrics-info) below. | `false` |
4848
| `APM_ENABLE_ACCESS_LOGS` | Sends access logs to Splunk when it's set to `true`. Disabled by default. | `false` |
4949

50-
<div id="splunk-metrics-info">
51-
{{% alert color="info" %}}
52-
**Splunk supports two types of indexes:**
53-
54-
* **Event indexes**: These are the default index type and impose minimal structure, allowing them to store any kind of data, including metrics. To ingest logs, you must configure an event index as the default index in your HEC token.
55-
56-
* **Metrics indexes**: These use a highly structured format designed for high-volume, low-latency metrics data. To ingest metrics, create an index named `mxmetrics` and add it to the list of allowed indexes in your HEC token. For more information, refer to the [Splunk documentation](https://help.splunk.com/en/splunk-cloud-platform/get-data-in/metrics/9.2.2406/introduction-to-metrics/overview-of-metrics).
57-
58-
{{% /alert %}}
59-
</div>
60-
50+
<div id="splunk-metrics-info">
51+
{{% alert color="info" %}}**Splunk supports two types of indexes:** <br/>
52+
**Event indexes**: These are the default index type and impose minimal structure, allowing them to store any kind of data, including metrics. To ingest logs, you must configure an event index as the default index in your HEC token. <br/>
53+
**Metrics indexes**: These use a highly structured format designed for high-volume, low-latency metrics data. To ingest metrics, create an index named `mxmetrics` and add it to the list of allowed indexes in your HEC token. For more information, refer to the [Splunk documentation](https://help.splunk.com/en/splunk-cloud-platform/get-data-in/metrics/9.2.2406/introduction-to-metrics/overview-of-metrics).{{% /alert %}}
54+
</div>
6155

6256
5. Return to the **Environments** page for your app and **Deploy** or **Transport** your app into the selected environment.
6357

content/en/docs/deployment/mx-azure/mx-azure-support.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ Node-level OS components receive weekly security patches through Microsoft's Nod
158158

159159
These automated upgrade cadences cannot be modified by customers.
160160

161+
{{% alert color="info" %}}
162+
During automated upgrades, application containers may restart. However, built-in redundancy ensures that at least one replica remains available at all times, so no downtime occurs.
163+
{{% /alert %}}
164+
161165
## Mendix Support Coverage Examples
162166

163167
### Example Supported Scenarios

content/en/docs/developerportal/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ The navigation pane is divided into these main categories:
9494
* [General](/developerportal/general/)
9595
* [Project Management](/developerportal/project-management/)
9696
* [App Insights](/developerportal/app-insights/)
97-
* [Repository]()
97+
* [Repository](/developerportal/repository/)
9898
* [Deployment](/developerportal/deploy/general/)
99-
* [Monitoring]()
99+
* [Monitoring](/developerportal/monitoring/)
100100

101101
{{% alert color="info" %}}
102102
The features in the navigation pane can also be accessed via APIs, enabling third-party developers to integrate their own widgets and plugins. For more information, see [API Documentation](/apidocs-mxsdk/apidocs/).

content/en/docs/marketplace/overview/marketplace-home-page.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ The **Personal** category contains the items described in the following sections
4848

4949
Clicking **Drafts** opens the **My Drafts** page, where you can see and manage the drafts for all the Marketplace content you have started.
5050

51+
{{% alert color="info" %}}
52+
Only drafts that have been active over the last 30 days are displayed. Drafts are automatically removed if they have been inactive for more than 30 days.
53+
{{% /alert %}}
54+
5155
You can also find details on how many total drafts you have, which drafts are ready to publish or are awaiting approval, and which drafts have been declined.
5256

5357
These are the possible **Status** entries for each item:

content/en/docs/marketplace/platform-supported-content/modules/global-inbox.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ The **Global Inbox** consists of the following components:
6363

6464
The Global Inbox operates with the following event flow:
6565

66-
1. Publisher App registration: Each publisher application registers with the Global Inbox by publishing a **PublisherAppRegisteredEvent**. This ensures the Global Inbox knows which apps are available to send task events.
66+
1. Publisher App registration: Each publisher application registers with the Global Inbox by publishing a **PublisherAppRegisteredEvent**. This ensures the Global Inbox knows which apps are available to send task events. As part of this registration, the application's workflow groups are synchronized with the Global Inbox.
6767
2. Task update and event publication: When a workflow or task is created, updated, or completed in a publisher application that includes the Global Inbox Connector, the connector publishes the following events:
6868
* **WorkflowUpdatedEvent** – triggered when the workflow is updated.
6969
* **UserTaskUpdatedEvent** – triggered when a user task is updated.
7070
* **UserTaskEndedEvent** – triggered when a user task is completed or aborted.
7171
* **UserTaskOutcomeSelectedEvent** – triggered when a user completes a task by selecting an outcome.
72+
* **WorkflowGroupUpdatedEvent** – triggered when a workflow group is updated.
7273
3. Event consumption: The Global Inbox consumes these events and updates or creates the corresponding task entries in the central task list.
7374
4. Task visibility and navigation: Tasks become visible in the Global Inbox. Users can click a button to navigate directly to the corresponding task page in the Publisher Application to take action.
7475

@@ -138,6 +139,5 @@ Any user that can see a task in Publisher Application can see the same task in t
138139

139140
## Limitations
140141

141-
* **Global Inbox** does not support [Workflow Groups](/refguide/workflow-groups/) at the moment. This will be introduced at a later stage.
142142
* **Global Inbox** has limited support for error handling. Any exceptions that occur in a microflow after updating a user task (or other Workflow-related entity) in the same microflow (for example, updating the targeted users or due date) might result in data becoming out of sync. This is a temporary limitation that will be resolved in an upcoming version.
143-
* Workflows and tasks that are modeled in the same app that includes the Global Inbox module are NOT available in the Global Inbox. The Global Inbox app only consumes and displays workflow instances from other Mendix applications.
143+
* Workflows and tasks that are modeled in the same app that includes the Global Inbox module are NOT available in the Global Inbox. The Global Inbox app only consumes and displays workflow instances from other Mendix applications.

0 commit comments

Comments
 (0)