Closed otcbot[bot] closed 9 months ago
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/conf.py b/umn/source/conf.py (rejected hunks)
@@ -39,6 +39,7 @@ otcdocs_service_category = 'compute'
otcdocs_service_title = 'Elastic Cloud Server'
otcdocs_service_type = 'ecs'
otcdocs_search_environment = 'hc_swiss'
+otcdocs_search_index = 'search_index_swiss'
otcdocs_search_url = "https://opensearch.eco.tsi-dev.otc-service.com/"
# If extensions (or modules to document with autodoc) are in another directory,
@@ -91,7 +92,7 @@ html_theme = 'otcdocs'
html_theme_options = {
"disable_search": True,
"site_name": "Internal Documentation Portal",
- "logo_url": "https://docs-int.otc-service.com",
+ "logo_url": "https://docs-int.sc.otc.t-systems.com",
}
# The name for this set of Sphinx documents. If None, it defaults to
diff a/doc/source/conf.py b/doc/source/conf.py (rejected hunks)
@@ -31,6 +31,18 @@ otcdocs_repo_name = 'docs-swiss/elastic-cloud-server'
otcdocs_git_fqdn = 'gitea.eco.tsi-dev.otc-service.com'
otcdocs_git_type = 'gitea'
+# Those variables are needed for indexing into OpenSearch
+otcdocs_doc_environment = ''
+otcdocs_doc_link = ''
+otcdocs_doc_title = ''
+otcdocs_doc_type = ''
+otcdocs_service_category = 'compute'
+otcdocs_service_title = 'Elastic Cloud Server'
+otcdocs_service_type = 'ecs'
+otcdocs_search_environment = 'hc_swiss'
+otcdocs_search_index = 'search_index_swiss'
+otcdocs_search_url = "https://opensearch.eco.tsi-dev.otc-service.com/"
+
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -81,7 +93,7 @@ html_theme = 'otcdocs'
html_theme_options = {
"disable_search": True,
"site_name": "Internal Documentation Portal",
- "logo_url": "https://docs-int.otc-service.com",
+ "logo_url": "https://docs-int.sc.otc.t-systems.com",
}
# The name for this set of Sphinx documents. If None, it defaults to
diff a/api-ref/source/conf.py b/api-ref/source/conf.py (rejected hunks)
@@ -39,6 +39,7 @@ otcdocs_service_category = 'compute'
otcdocs_service_title = 'Elastic Cloud Server'
otcdocs_service_type = 'ecs'
otcdocs_search_environment = 'hc_swiss'
+otcdocs_search_index = 'search_index_swiss'
otcdocs_search_url = "https://opensearch.eco.tsi-dev.otc-service.com/"
# If extensions (or modules to document with autodoc) are in another directory,
@@ -91,7 +92,7 @@ html_theme = 'otcdocs'
html_theme_options = {
"disable_search": True,
"site_name": "Internal Documentation Portal",
- "logo_url": "https://docs-int.otc-service.com",
+ "logo_url": "https://docs-int.sc.otc.t-systems.com",
}
# The name for this set of Sphinx documents. If None, it defaults to
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-swiss/elastic-cloud-server/pulls/17.
There were patch conflicts, please review original patch file.