Skip to content

Propagate changes to elastic-cloud-server-api-ref from PreProd environment - #246

Merged
otc-zuul[bot] merged 2 commits into
mainfrom
propose-api-ref#343
Jun 30, 2026
Merged

otc-zuul[bot] merged 2 commits into
mainfrom
propose-api-ref#343

Conversation

@otcbot

@otcbot otcbot Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

This is an automatically created Pull Request for changes to elastic-cloud-server-api-ref to promote changes down the pipeline to Production environment.

The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/elastic-cloud-server/pulls/343.

There were patch conflicts, please review original patch file.

@otcbot otcbot Bot added the documentation Improvements or additions to documentation label May 18, 2026
@otcbot

otcbot Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor Author

I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.

BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.

In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.

Following is the patch remainder:

diff a/umn/source/change_history.rst b/umn/source/change_history.rst	(rejected hunks)
@@ -8,6 +8,10 @@ Change History
 +-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Released On                       | Description                                                                                                                                                                                                                                                                                                                                                                             |
 +===================================+=========================================================================================================================================================================================================================================================================================================================================================================================+
+| 2026-05-12                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                         |
+|                                   |                                                                                                                                                                                                                                                                                                                                                                                         |
+|                                   | Added X1m ECSs in :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`.                                                                                                                                                                                                                                                                                                                |
++-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2026-04-08                        | Added the following content:                                                                                                                                                                                                                                                                                                                                                            |
 |                                   |                                                                                                                                                                                                                                                                                                                                                                                         |
 |                                   | :ref:`Configuring Secure Boot for an ECS <en-us_topic_0000001469584572>`                                                                                                                                                                                                                                                                                                                |
diff a/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/a_summary_list_of_ecs_specifications.rst b/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/a_summary_list_of_ecs_specifications.rst	(rejected hunks)
@@ -496,7 +516,7 @@ For more details, see :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`.
    | m9.48xlarge.8 | 192   | 1,504  | 120/102                        | 4,000            | 1,000               | 64              | 12        | 64                      | 70                          |                |
    +---------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+-------------------------+-----------------------------+----------------+
 
-.. table:: **Table 13** M7n ECS specifications
+.. table:: **Table 14** M7n ECS specifications
 
    +----------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+---------------------------------+-----------------------------+----------------+
    | Flavor         | vCPUs | Memory | Max./Assured Network Bandwidth | Max. Network PPS | Network Connections | Max. NIC Queues | Max. NICs | Max./Assured EVS Disk Bandwidth | Max. EVS Disk IOPS (10,000) | Virtualization |
diff a/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/memory-optimized_ecss.rst b/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/memory-optimized_ecss.rst	(rejected hunks)
@@ -8,6 +8,7 @@ Memory-optimized ECSs
 Overview
 --------
 
+-  X1m ECSs are built on the KVM virtualization platform and designed for processing large-scale datasets in memory. They use Intel® Xeon® Scalable processors, network acceleration engines, and DPDK rapid packet processing to provide higher network performance and up to 512 GiB of DDR4 memory for memory-intensive compute applications.
 -  M9 ECSs use the sixth-generation Intel® Xeon® Scalable processors and KVM virtualization to provide enhanced compute, network, and security performance to fulfill the high-performance and large-memory requirements.
 -  M7n ECSs use the third-generation Intel® Xeon® Scalable processors to provide enhanced performance, security, and stability. An M7n ECS can have up to 96 vCPUs and 3,200 MHz memory frequency. It provides a secure and trusted cloud environment and is suitable for memory-intensive compute applications.
 -  M4 ECSs use the second-generation Intel® Xeon® Scalable processors with technologies optimized to offer powerful and stable compute performance. Using 25GE high-speed intelligent NICs, M4 ECSs provide a maximum memory size of 512 GiB based on DDR4 for memory-intensive applications with high requirements on network bandwidth and PPS.
@@ -40,7 +61,7 @@ Specifications
    | m9.48xlarge.8 | 192   | 1,504  | 120/102                        | 4,000            | 1,000               | 64              | 12        | 64                      | 70                          |                |
    +---------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+-------------------------+-----------------------------+----------------+
 
-.. table:: **Table 2** M7n ECS specifications
+.. table:: **Table 3** M7n ECS specifications
 
    +----------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+---------------------------------+-----------------------------+----------------+
    | Flavor         | vCPUs | Memory | Max./Assured Network Bandwidth | Max. Network PPS | Network Connections | Max. NIC Queues | Max. NICs | Max./Assured EVS Disk Bandwidth | Max. EVS Disk IOPS (10,000) | Virtualization |

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

@otcbot
otcbot Bot force-pushed the propose-api-ref#343 branch from db2fdf8 to e333e12 Compare May 25, 2026 17:12
@otcbot

otcbot Bot commented May 25, 2026

Copy link
Copy Markdown
Contributor Author

I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.

BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.

In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.

Following is the patch remainder:

diff a/umn/source/change_history.rst b/umn/source/change_history.rst	(rejected hunks)
@@ -8,6 +8,10 @@ Change History
 +-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Released On                       | Description                                                                                                                                                                                                                                                                                                                                                                             |
 +===================================+=========================================================================================================================================================================================================================================================================================================================================================================================+
+| 2026-05-12                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                         |
+|                                   |                                                                                                                                                                                                                                                                                                                                                                                         |
+|                                   | Added X1m ECSs in :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`.                                                                                                                                                                                                                                                                                                                |
++-----------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2026-04-08                        | Added the following content:                                                                                                                                                                                                                                                                                                                                                            |
 |                                   |                                                                                                                                                                                                                                                                                                                                                                                         |
 |                                   | :ref:`Configuring Secure Boot for an ECS <en-us_topic_0000001469584572>`                                                                                                                                                                                                                                                                                                                |
diff a/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/memory-optimized_ecss.rst b/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/memory-optimized_ecss.rst	(rejected hunks)
@@ -8,6 +8,7 @@ Memory-optimized ECSs
 Overview
 --------
 
+-  X1m ECSs are built on the KVM virtualization platform and designed for processing large-scale datasets in memory. They use Intel® Xeon® Scalable processors, network acceleration engines, and DPDK rapid packet processing to provide higher network performance and up to 512 GiB of DDR4 memory for memory-intensive compute applications.
 -  M9 ECSs use the sixth-generation Intel® Xeon® Scalable processors and KVM virtualization to provide enhanced compute, network, and security performance to fulfill the high-performance and large-memory requirements.
 -  M7n ECSs use the third-generation Intel® Xeon® Scalable processors to provide enhanced performance, security, and stability. An M7n ECS can have up to 96 vCPUs and 3,200 MHz memory frequency. It provides a secure and trusted cloud environment and is suitable for memory-intensive compute applications.
 -  M4 ECSs use the second-generation Intel® Xeon® Scalable processors with technologies optimized to offer powerful and stable compute performance. Using 25GE high-speed intelligent NICs, M4 ECSs provide a maximum memory size of 512 GiB based on DDR4 for memory-intensive applications with high requirements on network bandwidth and PPS.
@@ -40,7 +61,7 @@ Specifications
    | m9.48xlarge.8 | 192   | 1,504  | 120/102                        | 4,000            | 1,000               | 64              | 12        | 64                      | 70                          |                |
    +---------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+-------------------------+-----------------------------+----------------+
 
-.. table:: **Table 2** M7n ECS specifications
+.. table:: **Table 3** M7n ECS specifications
 
    +----------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+---------------------------------+-----------------------------+----------------+
    | Flavor         | vCPUs | Memory | Max./Assured Network Bandwidth | Max. Network PPS | Network Connections | Max. NIC Queues | Max. NICs | Max./Assured EVS Disk Bandwidth | Max. EVS Disk IOPS (10,000) | Virtualization |
diff a/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/a_summary_list_of_ecs_specifications.rst b/umn/source/service_overview/ecs_types_and_specifications/ecs_specifications/a_summary_list_of_ecs_specifications.rst	(rejected hunks)
@@ -496,7 +516,7 @@ For more details, see :ref:`Memory-optimized ECSs <en-us_topic_0035550301>`.
    | m9.48xlarge.8 | 192   | 1,504  | 120/102                        | 4,000            | 1,000               | 64              | 12        | 64                      | 70                          |                |
    +---------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+-------------------------+-----------------------------+----------------+
 
-.. table:: **Table 13** M7n ECS specifications
+.. table:: **Table 14** M7n ECS specifications
 
    +----------------+-------+--------+--------------------------------+------------------+---------------------+-----------------+-----------+---------------------------------+-----------------------------+----------------+
    | Flavor         | vCPUs | Memory | Max./Assured Network Bandwidth | Max. Network PPS | Network Connections | Max. NIC Queues | Max. NICs | Max./Assured EVS Disk Bandwidth | Max. EVS Disk IOPS (10,000) | Virtualization |

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

@mpristro
mpristro force-pushed the propose-api-ref#343 branch from e333e12 to 804544d Compare June 23, 2026 15:05
@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown

@mpristro mpristro added the gate Merge PR label Jun 30, 2026
@otc-zuul-prod

otc-zuul-prod Bot commented Jun 30, 2026

Copy link
Copy Markdown

Build succeeded.
https://zuul.eco.tsi-dev.otc-service.com/t/eco2/buildset/0103d949ddf54167bc74ab74d14fd9f8

✔️ noop SUCCESS in 0s
✔️ otc-tox-docs SUCCESS in 11m 45s

@otc-zuul-prod

otc-zuul-prod Bot commented Jun 30, 2026

Copy link
Copy Markdown

Pull request merge failed: Resource not accessible by integration, You may need to manually rebase your PR and retry.

@otc-zuul

otc-zuul Bot commented Jun 30, 2026

Copy link
Copy Markdown

Build succeeded.
https://zuul.otc-service.com/t/eco/buildset/48e4043575c64bd3ba5dfea30d6832e9

✔️ noop SUCCESS in 0s
✔️ otc-tox-docs SUCCESS in 26m 41s

@otc-zuul
otc-zuul Bot merged commit 3be8136 into main Jun 30, 2026
6 checks passed
@otc-zuul
otc-zuul Bot deleted the propose-api-ref#343 branch June 30, 2026 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation gate Merge PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants