Skip to content

Commit 560c514

Browse files
authored
STF 1.5.5 release ops (#546)
2 parents a24eb4b + cba41a6 commit 560c514

7 files changed

+54
-23
lines changed

common/global/stf-attributes.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ ifeval::["{build}" == "upstream"]
4949
:Project: Service{nbsp}Telemetry{nbsp}Framework
5050
:ProjectShort: STF
5151
:MessageBus: Apache{nbsp}Qpid{nbsp}Dispatch{nbsp}Router
52-
:SupportedOpenShiftVersion: 4.12
53-
:NextSupportedOpenShiftVersion: 4.14
52+
:SupportedOpenShiftVersion: 4.14
53+
:NextSupportedOpenShiftVersion: 4.16
5454
:CodeReadyContainersVersion: 2.19.0
5555
endif::[]
5656

@@ -67,6 +67,6 @@ ifeval::["{build}" == "downstream"]
6767
:Project: Service{nbsp}Telemetry{nbsp}Framework
6868
:ProjectShort: STF
6969
:MessageBus: AMQ{nbsp}Interconnect
70-
:SupportedOpenShiftVersion: 4.12
71-
:NextSupportedOpenShiftVersion: 4.14
70+
:SupportedOpenShiftVersion: 4.14
71+
:NextSupportedOpenShiftVersion: 4.16
7272
endif::[]

doc-Service-Telemetry-Framework/modules/proc_accessing-uis-for-stf-components.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ You need the following permissions to access the corresponding component UI's:
1010

1111
[source,json,options="nowrap"]
1212
----
13-
{"namespace":"service-telemetry", "resource":"grafana", "group":"grafana.integreatly.org", "verb":"get"}
14-
{"namespace":"service-telemetry", "resource":"prometheus", "group":"monitoring.rhobs", "verb":"get"}
15-
{"namespace":"service-telemetry", "resource":"alertmanager", "group":"monitoring.rhobs", "verb":"get"}
13+
{"namespace":"service-telemetry", "resource":"grafanas", "group":"grafana.integreatly.org", "verb":"get"}
14+
{"namespace":"service-telemetry", "resource":"prometheuses", "group":"monitoring.rhobs", "verb":"get"}
15+
{"namespace":"service-telemetry", "resource":"alertmanagers", "group":"monitoring.rhobs", "verb":"get"}
1616
----
1717

1818
For more information about RBAC, see https://docs.openshift.com/container-platform/{NextSupportedOpenShiftVersion}/authentication/using-rbac.html[Using RBAC to define and apply permissions].

doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-director-operator-for-the-overcloud.adoc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ data:
4141
verifyHostname: false
4242
sslProfile: sslProfile
4343
saslUsername: guest@default-interconnect
44-
saslPassword: pass:<password_from_stf>
44+
saslPassword: <password_from_stf>
4545
4646
MetricsQdrSSLProfiles:
4747
- name: sslProfile
@@ -58,6 +58,18 @@ data:
5858
CollectdSensubilityResultsChannel: sensubility/cloud1-telemetry
5959
----
6060

61+
* The `resource_registry` configuration directly loads the collectd service because you do not include the `collectd-write-qdr.yaml` environment file for multiple cloud deployments.
62+
* Replace the `host` sub-parameter of `MetricsQdrConnectors` with the value that you retrieved in xref:retrieving-the-qdr-route-address_assembly-completing-the-stf-configuration[].
63+
* Replace the `<password_from_stf>` portion of the `saslPassword` sub-parameter of `MetricsQdrConnectors` with the value you retrieved in xref:retrieving-the-qdr-password_assembly-completing-the-stf-configuration[].
64+
ifdef::include_when_13,include_when_17[]
65+
* Replace the `caCertFileContent` parameter with the contents retrieved in xref:getting-ca-certificate-from-stf-for-overcloud-configuration_assembly-completing-the-stf-configuration[].
66+
endif::include_when_13,include_when_17[]
67+
* Set `topic` value of `CeilometerQdrMetricsConfig.topic` to define the topic for Ceilometer metrics. The value is a unique topic identifier for the cloud such as `cloud1-metering`.
68+
* Set `CollectdAmqpInstances` sub-parameter to define the topic for collectd metrics. The section name is a unique topic identifier for the cloud such as `cloud1-telemetry`.
69+
ifndef::include_when_13[]
70+
* Set `CollectdSensubilityResultsChannel` to define the topic for collectd-sensubility events. The value is a unique topic identifier for the cloud such as `sensubility/cloud1-telemetry`.
71+
endif::[]
72+
6173
[role="_additional-resources"]
6274
.Additional resources
6375
* For more information about the `stf-connectors.yaml` environment file, see xref:configuring-the-stf-connection-for-the-overcloud_assembly-completing-the-stf-configuration[].

doc-Service-Telemetry-Framework/modules/proc_configuring-the-stf-connection-for-the-overcloud.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ parameter_defaults:
4343
verifyHostname: false
4444
sslProfile: sslProfile
4545
saslUsername: guest@default-interconnect
46-
saslPassword: pass:<password_from_stf>
46+
saslPassword: <password_from_stf>
4747
4848
MetricsQdrSSLProfiles:
4949
- name: sslProfile

doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-director-operator-for-stf.adoc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ data:
5454
CollectdConnectionType: amqp1
5555
CollectdAmqpInterval: 30
5656
CollectdDefaultPollingInterval: 30
57-
CollectdExtraPlugins:
58-
- vmem
57+
# to collect information about the virtual memory subsystem of the kernel
58+
# CollectdExtraPlugins:
59+
# - vmem
5960
6061
# set standard prefixes for where metrics are published to QDR
6162
MetricsQdrAddresses:
@@ -74,13 +75,16 @@ data:
7475
# note: this may need an adjustment if there are many metrics to be sent.
7576
collectd::plugin::amqp1::send_queue_limit: 5000
7677
77-
# receive extra information about virtual memory
78-
collectd::plugin::vmem::verbose: true
78+
# to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins
79+
# collectd::plugin::vmem::verbose: true
7980
8081
# provide name and uuid in addition to hostname for better correlation
8182
# to ceilometer data
8283
collectd::plugin::virt::hostname_format: "name uuid hostname"
8384
85+
# to capture all extra_stats metrics, comment out below config
86+
collectd::plugin::virt::extra_stats: cpu_util vcpu disk
87+
8488
# provide the human-friendly name of the virtual instance
8589
collectd::plugin:ConfigMap :virt::plugin_instance_format: metadata
8690
@@ -90,6 +94,9 @@ data:
9094
local:
9195
host: "%{hiera('fqdn_canonical')}"
9296
port: 11211
97+
98+
# report root filesystem storage metrics
99+
collectd::plugin::df::ignoreselected: false
93100
----
94101

95102
[role="_additional-resources"]

doc-Service-Telemetry-Framework/modules/proc_creating-the-base-configuration-for-stf.adoc

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ parameter_defaults:
3535
CollectdConnectionType: amqp1
3636
CollectdAmqpInterval: 30
3737
CollectdDefaultPollingInterval: 30
38-
CollectdExtraPlugins:
39-
- vmem
40-
38+
# to collect information about the virtual memory subsystem of the kernel
39+
# CollectdExtraPlugins:
40+
# - vmem
41+
4142
# set standard prefixes for where metrics are published to QDR
4243
MetricsQdrAddresses:
4344
- prefix: 'collectd'
@@ -55,8 +56,8 @@ parameter_defaults:
5556
# note: Adjust the value of the `send_queue_limit` to handle your required volume of metrics.
5657
collectd::plugin::amqp1::send_queue_limit: 5000
5758
58-
# receive extra information about virtual memory
59-
collectd::plugin::vmem::verbose: true
59+
# to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins
60+
# collectd::plugin::vmem::verbose: true
6061
6162
# set memcached collectd plugin to report its metrics by hostname
6263
# rather than host IP, ensuring metrics in the dashboard remain uniform
@@ -65,6 +66,9 @@ parameter_defaults:
6566
host: "%{hiera('fqdn_canonical')}"
6667
port: 11211
6768
69+
# report root filesystem storage metrics
70+
collectd::plugin::df::ignoreselected: false
71+
6872
# align defaults across OSP versions
6973
collectd::plugin::cpu::reportbycpu: true
7074
collectd::plugin::cpu::reportbystate: true
@@ -105,8 +109,9 @@ parameter_defaults:
105109
CollectdConnectionType: amqp1
106110
CollectdAmqpInterval: 30
107111
CollectdDefaultPollingInterval: 30
108-
CollectdExtraPlugins:
109-
- vmem
112+
# to collect information about the virtual memory subsystem of the kernel
113+
# CollectdExtraPlugins:
114+
# - vmem
110115
111116
# set standard prefixes for where metrics are published to QDR
112117
MetricsQdrAddresses:
@@ -125,13 +130,16 @@ parameter_defaults:
125130
# note: this may need an adjustment if there are many metrics to be sent.
126131
collectd::plugin::amqp1::send_queue_limit: 5000
127132
128-
# receive extra information about virtual memory
129-
collectd::plugin::vmem::verbose: true
133+
# to receive extra information about virtual memory, you must enable vmem plugin in CollectdExtraPlugins
134+
# collectd::plugin::vmem::verbose: true
130135
131136
# provide name and uuid in addition to hostname for better correlation
132137
# to ceilometer data
133138
collectd::plugin::virt::hostname_format: "name uuid hostname"
134139
140+
# to capture all extra_stats metrics, comment out below config
141+
collectd::plugin::virt::extra_stats: cpu_util vcpu disk
142+
135143
# provide the human-friendly name of the virtual instance
136144
collectd::plugin::virt::plugin_instance_format: metadata
137145
@@ -141,5 +149,9 @@ parameter_defaults:
141149
local:
142150
host: "%{hiera('fqdn_canonical')}"
143151
port: 11211
152+
153+
# report root filesystem storage metrics
154+
collectd::plugin::df::ignoreselected: false
155+
144156
----
145157
endif::include_when_16[]

doc-Service-Telemetry-Framework/modules/proc_deploying-stf-on-openshift-disconnected-environments.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Since {Project} ({ProjectShort}) version 1.5.4, you can deploy {ProjectShort} in
88

99
.Prerequisites
1010

11-
* {OpenShift} Extended Update Support (EUS) version 4.12 or 4.14 deployed in a restricted network.
11+
* {OpenShift} Extended Update Support (EUS) version {SupportedOpenShiftVersion} or {NextSupportedOpenShiftVersion} deployed in a restricted network.
1212
* A mirror registry so that the {OpenShift} cluster can access the required images. For more information about mirror registries, see link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{NextSupportedOpenShiftVersion}/html/installing/disconnected-installation-mirroring[Disconnected installation mirroring] in the {OpenShift} _Installing_ guide.
1313
* All the {ProjectShort} dependencies are available in the {OpenShift} cluster mirror registry.
1414

0 commit comments

Comments
 (0)