Enable --cluster-monitoring flag description #48
Conversation
Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
flacatus
requested review from
azatsarynnyy,
benoitf,
l0rd,
nickboldt,
rhopp and
vparfonov
as code owners
flacatus
changed the title
|
cc @tolusha |
| @@ -129,9 +129,9 @@ installerString=" installer: string({\n\ | |||
| clusterMonitoringString=" 'cluster-monitoring': boolean({\n\ | |||
| default: false,\n\ | |||
| hidden: false,\n\ | |||
| description: \`Enable cluster monitoring to scrape metrics in Prometheus.\n\ | |||
| description: \`Enable cluster monitoring to scrape CodeReady Workspaces metrics in Prometheus.\n\ | |||
There was a problem hiding this comment.
do we need to deviate from upstream here?
There was a problem hiding this comment.
Not in this case. We hide this option in chectl. That's why we have to readd in downstream.m
There was a problem hiding this comment.
so no need to inject "CodeReady Workspaces" into this line.
| @@ -125,6 +126,13 @@ installerString=" installer: string({\n\ | |||
| description: 'Installer type. If not set, default is "olm" for OpenShift >= 4.2, and "operator" for earlier versions.',\n\ | |||
| options: ['olm', 'operator']\n\ | |||
| }),"; # echo -e "$installerString" | |||
| clusterMonitoringString=" 'cluster-monitoring': boolean({\n\ | |||
There was a problem hiding this comment.
for easier maintenance in future, this block could be read from upstream, then sed-replaced:
clusterMonitoringString="$(grep -A5 "'cluster-monitoring': boolean" src/commands/server/deploy.ts | sed -r -e "s/hidden: true/hidden: false/g")"; # echo -e "$clusterMonitoringString"
There was a problem hiding this comment.
@nickboldt How we spoke recently if I'll do in this way I'll have some problems by applying changes with sed but I have a lot of problems with sed.
I've tried for example
perl -0777 -p -i -e 's|(\ +'"'cluster-monitoring'"': boolean\({.*?}\),)| ${1} =~ /.+openshift.+/?"INSERT-CONTENT-HERE":${1}|gse' "${TARGETDIR}/${d}"
sed -r -e "s|INSERT-CONTENT-HERE|"\\\\ \\${clusterMonitoringString}$"|g" -i "${TARGETDIR}/${d}"
Can you help me please to find the right sed command?
What does this PR do?
This PR enables cluster monitoring description in Readme.md. Also change default olm suggested namespace name(
openshift-workspaces).Upstream related PR: che-incubator/chectl#966
What issues does this PR fix or reference?