Skip to content

Commit 3e63ac7

Browse files
committed
NMS-19060: Cleanup docs build for CentOS 10 support
* Fix includes and removed duplicate include for CentOS 9 and 10. * Simplify variables for compatible versions used in the system tp requirements. * Fixed build warnings for Kafka topic placeholders and masquarded them so that they are not tried to be resolved as an Antora variable. * Remove Rocky Linux and just keep it to the major upstream RPM/DEB distros Signed-off-by: Ronny Trommer <[email protected]>
1 parent 66e4a4f commit 3e63ac7

File tree

7 files changed

+18
-36
lines changed

7 files changed

+18
-36
lines changed

docs/antora.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,22 @@ asciidoc:
88
experimental: true
99
source-language: asciidoc@
1010
xrefstyle: short@
11-
compatible-centos7: '7.x'
12-
compatible-centos-stream9: '9.x'
13-
compatible-centos-stream10: '10.x'
14-
compatible-rhel7: '7.x'
15-
compatible-rhel8: '8.x'
16-
compatible-rhel9: '9.x'
17-
compatible-rhel10: '10.x'
18-
compatible-ubuntu: '20.04 LTS'
19-
compatible-debian: '9 - 11'
20-
compatible-rocky-linux: '9.x'
11+
compatible-centos: '9,10'
12+
compatible-rhel: '8,9,10'
13+
compatible-ubuntu: '24.04 LTS'
14+
compatible-debian: '11, 12'
2115
compatible-opennms-plugin: '9 - 11.2'
2216
compatible-oia: '1.6.1'
2317
compatible-cassandra: '4.17.0'
2418
compatible-elasticsearch: '8.18.2'
2519
compatible-javajdk: '17'
26-
compatible-kafka: '1.x - 3.x'
27-
compatible-postgresql: '13.x - 15.x'
20+
compatible-kafka: '1.x - 4.x'
21+
compatible-postgresql: '14.x - 15.x'
2822
compatible-rrdtool: '1.7.x'
2923
jasperreportsversion: '6.3.0'
30-
latest-meridian-stable: '2023'
24+
latest-meridian-stable: '2025'
3125
postgresql-version: '15'
32-
jmx-prom-exporter-version: '1.3.0'
26+
jmx-prom-exporter-version: '1.4.0'
3327
nav:
3428
- modules/ROOT/nav.adoc
3529
- modules/releasenotes/nav.adoc

docs/modules/deployment/pages/core/centos10/install-core.adoc renamed to docs/modules/deployment/pages/core/centos-rhel10/install-core.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifeval::["{page-component-title}" == "Horizon"]
2-
include::../centos/adoptium.adoc[]
2+
include::../centos-rhel/adoptium.adoc[]
33
endif::[]
44

55
ifeval::["{page-component-title}" == "Horizon"]

docs/modules/deployment/pages/core/centos10/postgresql.adoc renamed to docs/modules/deployment/pages/core/centos-rhel10/postgresql.adoc

File renamed without changes.

docs/modules/deployment/pages/core/install.adoc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ include::centos-rhel9/postgresql.adoc[]
9797
CentOS/RHEL 10::
9898
+
9999
--
100-
include::centos10/postgresql.adoc[]
100+
include::centos-rhel10/postgresql.adoc[]
101101
--
102102
ifeval::["{page-component-title}" == "Horizon"]
103103
@@ -129,10 +129,10 @@ CentOS/RHEL 9::
129129
include::centos-rhel9/install-core.adoc[]
130130
--
131131
132-
CentOS 10::
132+
CentOS/RHEL 10::
133133
+
134134
--
135-
include::centos10/install-core.adoc[]
135+
include::centos-rhel10/install-core.adoc[]
136136
--
137137
138138
ifeval::["{page-component-title}" == "Horizon"]
@@ -168,12 +168,6 @@ CentOS/RHEL 9::
168168
include::centos-rhel/initialize-core.adoc[]
169169
--
170170
171-
CentOS 10::
172-
+
173-
--
174-
include::centos/initialize-core.adoc[]
175-
--
176-
177171
ifeval::["{page-component-title}" == "Horizon"]
178172
Debian/Ubuntu::
179173
+

docs/modules/deployment/pages/core/system-requirements.adoc

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ OpenNMS {page-component-title} requires one of the following operating systems:
3535
| Operating System | Compatible Versions (64-bit)
3636

3737
| RHEL
38-
| {compatible-rhel9} +
39-
{compatible-rhel10}
38+
| {compatible-rhel}
4039

4140
| CentOS
42-
| {compatible-centos-stream9} +
43-
{compatible-centos-stream10}
41+
| {compatible-centos}
4442

4543
ifeval::["{page-component-title}" == "Horizon"]
4644
| Debian
@@ -49,9 +47,6 @@ ifeval::["{page-component-title}" == "Horizon"]
4947
| Ubuntu
5048
| {compatible-ubuntu}
5149
endif::[]
52-
53-
| Rocky Linux
54-
| {compatible-rocky-linux}
5550
|===
5651

5752
See the xref:releasenotes:whatsnew.adoc[release notes] for information about platform support changes, including deprecated platforms.
@@ -94,4 +89,4 @@ Components marked with an asterisk are required:
9489
|===
9590

9691
== Containerized environments
97-
See xref:deployment:core/containers.adoc[containerized deployment] for information on deploying {page-component-title} via Kubernetes or OpenShift.
92+
See xref:deployment:core/containers.adoc[containerized deployment] for information on deploying {page-component-title} via Kubernetes or OpenShift.

docs/modules/deployment/pages/minion/system-requirements.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ OpenNMS {page-component-title} runs on the following operating systems:
3535
| Operating System | Supported Versions (64-bit)
3636

3737
| RHEL
38-
| {compatible-rhel8} +
39-
{compatible-rhel9}
38+
| {compatible-rhel}
4039

4140
| CentOS
42-
| {compatible-centos-stream}
41+
| {compatible-centos}
4342

4443
ifeval::["{page-component-title}" == "Horizon"]
4544
| Debian

docs/modules/deployment/pages/repos/rhel-centos/horizon-rhel10.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
----
44
sudo dnf -y install https://yum.opennms.org/repofiles/opennms-repo-stable-rhel9.noarch.rpm
55
----
6-
IMPORTANT: The next command is a workaround until https://opennms.atlassian.net/browse/NMS-19071 is solved.
6+
NOTE: This is a workaround until https://opennms.atlassian.net/browse/NMS-19071[NMS-19071] is solved.
77
[source, console]
88
----
99
sudo sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/opennms-repo-stable-rhel9.repo

0 commit comments

Comments
 (0)