Introduce new monitoring flag #194
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,8 @@ The following table lists the configurable parameters of the Orchestrator chart | |
| | `rhdhOperator.secretRef.github.token` | Key in the secret with name defined in the 'name' field that contains the value of the authentication token as expected by GitHub. Required for importing resource to the catalog, launching software templates and more. Defaults to 'GITHUB_TOKEN', empty for not available. | `"GITHUB_TOKEN"` | | ||
| | `rhdhOperator.secretRef.github.clientId` | Key in the secret with name defined in the 'name' field that contains the value of the client ID that you generated on GitHub, for GitHub authentication (requires GitHub App). Defaults to 'GITHUB_CLIENT_ID', empty for not available. | `"GITHUB_CLIENT_ID"` | | ||
| | `rhdhOperator.secretRef.github.clientSecret` | Key in the secret with name defined in the 'name' field that contains the value of the client secret tied to the generated client ID. Defaults to 'GITHUB_CLIENT_SECRET', empty for not available. | `"GITHUB_CLIENT_SECRET"` | | ||
| | `rhdhOperator.secretRef.k8s.clusterToken` | Key in the secret with name defined in the 'name' field that contains the value of the API URL of the kubernetes cluster. Defaults to 'K8S_CLUSTER_TOKEN', empty for not available. | `"K8S_CLUSTER_TOKEN"` | | ||
| | `rhdhOperator.secretRef.k8s.clusterUrl` | Key in the secret with name defined in the 'name' field that contains the value of the Kubernetes API bearer token used for authentication. Defaults to 'K8S_CLUSTER_URL', empty for not available. | `"K8S_CLUSTER_URL"` | | ||
| | `rhdhOperator.secretRef.argocd.url` | Key in the secret with name defined in the 'name' field that contains the value of the URL of the ArgoCD API server. Defaults to 'ARGOCD_URL', empty for not available. | `"ARGOCD_URL"` | | ||
| | `rhdhOperator.secretRef.argocd.username` | Key in the secret with name defined in the 'name' field that contains the value of the username to login to ArgoCD. Defaults to 'ARGOCD_USERNAME', empty for not available. | `"ARGOCD_USERNAME"` | | ||
| | `rhdhOperator.secretRef.argocd.password` | Key in the secret with name defined in the 'name' field that contains the value of the password to authenticate to ArgoCD. Defaults to 'ARGOCD_PASSWORD', empty for not available. | `"ARGOCD_PASSWORD"` | | ||
|
|
@@ -39,28 +39,29 @@ The following table lists the configurable parameters of the Orchestrator chart | |
| | `rhdhOperator.subscription.name` | name of the operator package | `"rhdh"` | | ||
| | `rhdhPlugins.npmRegistry` | | `""` | | ||
| | `rhdhPlugins.scope` | | `"@janus-idp"` | | ||
| | `rhdhPlugins.orchestrator.package` | | `"backstage-plugin-orchestrator@1.10.6"` | | ||
| | `rhdhPlugins.orchestrator.integrity` | | `"sha512-qSXQ2O7/eLBEF186PzaRfzLfutFYUq9MdiiIZbHejz+KML9rVInPJkc1tine3R3JQVuw1QBIQ2vhPNbGbHXWZg=="` | | ||
| | `rhdhPlugins.orchestrator_backend.package` | | `"backstage-plugin-orchestrator-backend-dynamic@1.8.0"` | | ||
| | `rhdhPlugins.orchestrator_backend.integrity` | | `"sha512-wVZE7Dak10edxh1ZEckzYKrE13GrqhzSVelURhxjZcgXEHdGPWYUFHNMEpte7hzIBE85350Ka7fpy7C4BNPvEw=="` | | ||
| | `rhdhPlugins.notifications.package` | | `"[email protected].5"` | | ||
| | `rhdhPlugins.notifications.integrity` | | `"sha512-BQ7ujmrbv2MLelNGyleC4Z8fVVywYBMYZTwmRC534WCT38QHQ0cWJbebOgeIYszFA98STW4F5tdKbVot/2gWMg=="` | | ||
| | `rhdhPlugins.notifications_backend.package` | | `"[email protected].11"` | | ||
| | `rhdhPlugins.notifications_backend.integrity` | | `"sha512-5zluThJwFVKX0Wlh4E15vDKUFGu/qJ0UsxHYWoISJ+ing1R38gskvN3kukylNTgOp8B78OmUglPfNlydcYEHvA=="` | | ||
| | `postgres.serviceName` | The name of the Postgres DB service to be used by platform services. Cannot be empty. | `"sonataflow-psql-postgresql"` | | ||
| | `postgres.serviceNamespace` | The namespace of the Postgres DB service to be used by platform services. | `"sonataflow-infra"` | | ||
| | `postgres.authSecret.name` | name of existing secret to use for PostgreSQL credentials. | `"sonataflow-psql-postgresql"` | | ||
| | `postgres.authSecret.userKey` | name of key in existing secret to use for PostgreSQL credentials. | `"postgres-username"` | | ||
| | `postgres.authSecret.passwordKey` | name of key in existing secret to use for PostgreSQL credentials. | `"postgres-password"` | | ||
| | `postgres.database` | existing database instance used by data index and job service | `"sonataflow"` | | ||
| | `orchestrator.namespace` | Namespace where sonataflow's workflows run. The value is captured when running the setup.sh script and stored as a label in the selected namespace. User can override the value by populating this field. Defaults to `sonataflow-infra`. | `"sonataflow-infra"` | | ||
| | `orchestrator.sonataPlatform.resources.requests.memory` | | `"64Mi"` | | ||
| | `orchestrator.sonataPlatform.resources.requests.cpu` | | `"250m"` | | ||
| | `orchestrator.sonataPlatform.resources.limits.memory` | | `"1Gi"` | | ||
| | `orchestrator.sonataPlatform.resources.limits.cpu` | | `"500m"` | | ||
| | `tekton.enabled` | whether to create the Tekton pipeline resources | `false` | | ||
| | `argocd.enabled` | whether to install the ArgoCD plugin and create the orchestrator AppProject | `false` | | ||
| | `argocd.namespace` | Defines the namespace where the orchestrator's instance of ArgoCD is deployed. The value is captured when running setup.sh script and stored as a label in the selected namespace. User can override the value by populating this field. Defaults to `orchestrator-gitops` in the setup.sh script. | `""` | | ||
| | `monitoring.enabled` | whether to configure monitoring stack (Prometheus & Grafana) | `false` | | ||
|
|
||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| {{- if .Values.monitoring.enabled }} | ||
|
|
||
| apiVersion: operators.coreos.com/v1alpha1 | ||
| kind: Subscription | ||
| metadata: | ||
| name: grafana | ||
| namespace: {{ .Values.rhdhOperator.subscription.namespace }} | ||
| spec: | ||
| channel: v5 | ||
| installPlanApproval: Automatic | ||
| name: grafana-operator | ||
| source: community-operators | ||
| sourceNamespace: openshift-marketplace | ||
| startingCSV: grafana-operator.v5.8.0 | ||
|
|
||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| {{- if .Values.monitoring.enabled }} | ||
|
|
||
| apiVersion: operators.coreos.com/v1alpha1 | ||
| kind: Subscription | ||
| metadata: | ||
| name: prometheus | ||
| namespace: {{ .Values.rhdhOperator.subscription.namespace }} | ||
| spec: | ||
| channel: beta | ||
| installPlanApproval: Automatic | ||
| name: prometheus | ||
| source: community-operators | ||
| sourceNamespace: openshift-marketplace | ||
| startingCSV: prometheusoperator.0.56.3 | ||
|
|
||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,9 @@ spec: | |
| limits: | ||
| memory: {{ .Values.orchestrator.sonataPlatform.resources.limits.memory }} | ||
| cpu: {{ .Values.orchestrator.sonataPlatform.resources.limits.cpu }} | ||
| {{- if .Values.monitoring.enabled }} | ||
| monitoring: true | ||
|
There was a problem hiding this comment. this isn't part of the platform's spec: There was a problem hiding this comment. @JudeNiroshan is there a requirement to contribute a feature for the sonataflow operator for this? There was a problem hiding this comment. Yes, there is an epic in Sonataflow Operator -> apache/incubator-kie-kogito-serverless-operator#461 But it is not ready yet. Maybe we can ignore this CR condition until we have the operator modification. There was a problem hiding this comment. I think we should wait for the epic to be completed and available for testing before introducing the monitoring attribute to this PR. There was a problem hiding this comment. Yeah, I agree with you. I have already marked this as a draft PR. Once I have the serverless-workflows changes merged, I can do the manual testing on an already deployed helm chart.(Without the CR if condition) |
||
| {{- end }} | ||
| services: | ||
| dataIndex: | ||
| enabled: true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
those 2 lines seem to be be mixed, but not an issue of this PR.
Pls rebased (I fixed it in another PR which is merged)