Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release9.0.0hf1 #95

Merged
merged 4 commits into from
May 2, 2024
Merged

Release9.0.0hf1 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f6b56a
Merge pull request #91 from TIBCOSoftware/release9.0.0
mbochenk Feb 2, 2024
d6bf385
updated EFK and prometheus versions
pravallikavadd Apr 10, 2024
3d6eb34
Removing logging and monitoring as Openshift comes with default
pravallikavadd Apr 25, 2024
789a678
Adding JNDI properties on Openshift
pravallikavadd Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions jaspersoft-containers/K8s/jrs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,10 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y
| autoscaling.targetCPUUtilizationPercentage | Minimum CPU utilization to scale up the application | 50% |
| autoscaling.targetMemoryUtilizationPercentage | Minimum memory utilization to scale up the JasperReports® Server applications | 50% |
| autoscaling.scaleDown.stabilizationWindowSeconds | Time to give JasperReports® Server Webapp pod to finish all current tasks | 300 |
| metrics.enabled | Enables the Prometheus metrics | false |
| kube-prometheus-stack.prometheus-node-exporter.hostRootFsMount | | false |
| metrics.enabled | Enables the Prometheus metrics | false |
| kube-prometheus-stack.grafana.service.type | Grafana service type | NodePort |
| logging.enabled | Enables the centralized logging setup | false |
| elasticsearch.volumeClaimTemplate.resources.requests.storage | | 10Gi |
| kibana.service.type | Kibana service type | NodePort |
| elasticsearch.replicas | Number of replicas for Elasticsearch | 1 |
| logging.enabled | Enables the centralized logging setup | false |
| kibana.service.type | Kibana service type | NodePort |
| tolerations | Adds the tolerations as per K8s standard if needed | null |
| affinity | Adds the affinity as per K8s standards if needed | null |

Expand All @@ -166,7 +163,6 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y
helm repo add haproxytech https://haproxytech.github.io/helm-charts
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo add elastic https://helm.elastic.co

# Setting Java options
During the deployment of JasperReports® Server with helm, JAVA_OPTS can be specified within the `K8s/jrs/helm/values.yaml` file.
Expand Down Expand Up @@ -368,9 +364,9 @@ Elasticsearch and Kibana charts are added as a dependency in the main chart and
- To access kibana dashboard while using cluster ip as service type, run the following command.
`` HOST_NAME:NODE_PORT ``

For more information and configuration, see the [Official Docs](https://github.com/elastic/helm-charts)
For more information and configuration, see the [Official Docs](https://artifacthub.io/packages/helm/bitnami/elasticsearch)

**Note:** If any changes are done in the Elasticsearch chart for cluster name and port then the same must be updated accordingly for Fluentd.
**Note:** If any changes are made in the Elasticsearch chart for Elasticsearch host and port,then the same must be updated accordingly in FLUENT_ELASTICSEARCH_HOST or FLUENT_ELASTICSEARCH_PORT for Fluentd.

## Repository DB Does Not Exist

Expand Down Expand Up @@ -511,7 +507,6 @@ In case if you want to control traffic on AWS Application Load Balancer side ins
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo add haproxytech https://haproxytech.github.io/helm-charts
helm repo add elastic https://helm.elastic.co

15. Run ``helm dependencies update jrs/helm``.
16. Install the PostgreSQL chart:
Expand Down
13 changes: 5 additions & 8 deletions jaspersoft-containers/K8s/jrs/helm/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ dependencies:
version: 1.29.3
- name: kube-prometheus-stack
repository: https://prometheus-community.github.io/helm-charts
version: 16.0.1
version: 56.3.0
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.12.0
- name: kibana
repository: https://helm.elastic.co
version: 7.12.0
repository: https://charts.bitnami.com/bitnami
version: 19.17.2
- name: scalable-query-engine
repository: file://../../scalableQueryEngine/helm
version: 1.0.0
digest: sha256:fdcc8d54046046394473b3235c434bea30ff1beb1411d32a7976fdaacddec707
generated: "2023-04-18T21:04:35.6321472+05:30"
digest: sha256:81777879508a46ba9d340c5f8f545ec2877da61c38635945d0ae58c9a75f7ea4
generated: "2024-04-10T10:05:05.3822647+05:30"
11 changes: 3 additions & 8 deletions jaspersoft-containers/K8s/jrs/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@ dependencies:
condition: ingress.enabled

- name: kube-prometheus-stack
version: ~16.0.1
version: 56.3.0
repository: "@prometheus-community"
condition: metrics.enabled

- name: elasticsearch
version: 7.12.0
repository: "@elastic"
condition: logging.enabled

- name: kibana
version: 7.12.0
repository: "@elastic"
version: 19.17.2
repository: "https://charts.bitnami.com/bitnami"
condition: logging.enabled

- name: scalable-query-engine
Expand Down
Binary file added jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-19.17.2.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-7.12.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed jaspersoft-containers/K8s/jrs/helm/charts/kibana-7.12.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file added jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-56.3.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified jaspersoft-containers/K8s/jrs/helm/charts/scalable-query-engine-1.0.0.tgz
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion jaspersoft-containers/K8s/jrs/helm/templates/fluentd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,17 @@ spec:
image: {{ .Values.logging.fluentd.imageName }}:{{ .Values.logging.fluentd.imageTag }}
env:
- name: FLUENT_ELASTICSEARCH_HOST
value: "{{ .Values.logging.fluentd.esClusterName }}-master.{{.Release.Namespace }}.svc.cluster.local"
value: "{{ .Release.Name }}-elasticsearch.{{.Release.Namespace }}.svc.cluster.local"
- name: FLUENT_ELASTICSEARCH_PORT
value: "{{ .Values.logging.fluentd.esPort }}"
- name: FLUENT_ELASTICSEARCH_SCHEME
value: "http"
- name: FLUENTD_SYSTEMD_CONF
value: disable
- name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
value: cri
- name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
value: /var/log/containers/fluent*
resources:
limits:
memory: 512Mi
Expand Down
17 changes: 7 additions & 10 deletions jaspersoft-containers/K8s/jrs/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ metrics:
enabled: false

kube-prometheus-stack:
prometheus-node-exporter:
hostRootFsMount: false
grafana:
service:
type: NodePort
Expand All @@ -307,17 +305,16 @@ logging:
# Elastic search configuration for logging

elasticsearch:
replicas: 1
volumeClaimTemplate:
resources:
requests:
storage: 10Gi

## Visualization for logging
kibana:
service:
type: NodePort

## Visualization for logging
global:
kibanaEnabled: true
kibana:
service:
type: NodePort

## Tolerations for JRS webapp
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/

Expand Down
15 changes: 15 additions & 0 deletions jaspersoft-containers/OpenShift/jrs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ These parameters and values are the same as parameters in values.yaml.
| db.audit.dbName | JasperReports Server audit DB name | jasperserver |
| db.audit.dbUserName | JasperReports Server audit DB user name | postgres |
| db.audit.dbPassword | JasperReports Server audit DB password | postgres |
| db.jndiRestrictedAccess | Use special read-only user to access Analytics jndi. Enable only with corresponding property in default_master.properties, refer to JasperReports® Server Install Guide | false |
| db.analytics.dbUserName | JasperReports® Server analytics read-only DB username, used when secrets enabled | postgres |
| db.analytics.dbPassword | JasperReports® Server analytics read-only DB password, used when secrets enabled | postgres |
| db.auditAnalytics.dbUserName | JasperReports® Server Audit Analytics read-only DB username, used when secrets enabled | postgres |
| db.auditAnalytics.dbPassword | JasperReports® Server Audit Analytics read-only DB password, used when secrets enabled | postgres |
| extraEnv.javaopts | Adds all JAVA_OPTS | -XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 |
| extraEnv.normal | Adds all the normal key value pair variables | null |
| extraEnv.secrets | Adds all the environment references from secrets or configmaps| null |
Expand Down Expand Up @@ -343,6 +348,16 @@ To get the host name, run the below command:

See the [ Official Docs](https://docs.openshift.com/container-platform/4.8/networking/routes/secured-routes.html) for TLS configuration. You can do it from the OpenShift webconsole or update the `route.tls` section in values.yaml.

## Logging and Monitoring Configuration

Please note that logging and monitoring are included by default in OpenShift. For configuration details, refer to the official documentation. You can find more information at the following links:

- [OpenShift Documentation](https://docs.openshift.com/container-platform/4.11/welcome/index.html)

- [Monitoring in OpenShift](https://docs.openshift.com/container-platform/4.11/virt/logging_events_monitoring/virt-openshift-cluster-monitoring.html)

- [About Logging](https://docs.openshift.com/container-platform/4.11/logging/cluster-logging.html#cluster-logging)

# Integrating the Scalable Query Engine and JasperReports® Server

1. Enable the Scalable Query Engine to be installed by changing the `scalableQueryEngine.enabled = true`.
Expand Down
13 changes: 2 additions & 11 deletions jaspersoft-containers/OpenShift/jrs/helm/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
dependencies:
- name: kube-prometheus-stack
repository: https://prometheus-community.github.io/helm-charts
version: 16.0.1
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.12.0
- name: kibana
repository: https://helm.elastic.co
version: 7.12.0
- name: scalable-query-engine
repository: file://../../scalableQueryEngine/helm
version: 1.0.0
digest: sha256:6cc5582e010b7b299e7d6db3923de1553e0597473982201a71155c9cc268850a
generated: "2021-08-24T12:29:45.8782614+05:30"
digest: sha256:f4f39bc099039cfaf5d91949f1cebca86172757dd23043140977e7d942f9d33b
generated: "2024-04-25T21:12:11.0758453+05:30"
15 changes: 0 additions & 15 deletions jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,6 @@ maintainers:
url: https://www.jaspersoft.com/

dependencies:
- name: kube-prometheus-stack
version: ~16.0.1
repository: "@prometheus-community"
condition: metrics.enabled

- name: elasticsearch
version: 7.12.0
repository: "@elastic"
condition: logging.enabled

- name: kibana
version: 7.12.0
repository: "@elastic"
condition: logging.enabled

- name: scalable-query-engine
version: "1.0.0"
repository: "file://../../scalableQueryEngine/helm"
Expand Down
Binary file removed jaspersoft-containers/OpenShift/jrs/helm/charts/elasticsearch-7.12.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed jaspersoft-containers/OpenShift/jrs/helm/charts/kibana-7.12.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed jaspersoft-containers/OpenShift/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz
View file
Open in desktop
Binary file not shown.
51 changes: 51 additions & 0 deletions jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@ data:
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
/>
<Resource name="jdbc/jasperserverSystemAnalytics" auth="Container" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000"
{{- if .Values.db.jndiRestrictedAccess }}
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
{{- else }}
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
{{- end }}
driverClassName="org.postgresql.Driver"
accessToUnderlyingConnectionAllowed = "true"
validationQuery="SELECT 1"
testOnBorrow="true"
defaultReadOnly="true"
defaultAutoCommit="false"
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
/>
{{- if .Values.db.audit.enabled }}
<Resource name="jdbc/jasperserverAudit" auth="Container" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000"
Expand All @@ -39,6 +55,41 @@ data:
testOnBorrow="true"
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
/>
{{- end }}
{{- if .Values.db.audit.enabled }}
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000"
{{- if .Values.db.jndiRestrictedAccess }}
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
{{- else }}
username="${AUDIT_DB_USER_NAME}" password="${AUDIT_DB_PASSWORD}"
{{- end }}
driverClassName="org.postgresql.Driver"
accessToUnderlyingConnectionAllowed = "true"
validationQuery="SELECT 1"
testOnBorrow="true"
defaultReadOnly="true"
defaultAutoCommit="false"
url="jdbc:postgresql://${AUDIT_DB_HOST}:${AUDIT_DB_PORT}/${AUDIT_DB_NAME}"
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
/>
{{- else if semverCompare ">= 9.0.0" .Values.jrsVersion }}
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
maxActive="100" maxIdle="30" maxWait="10000"
{{- if .Values.db.jndiRestrictedAccess }}
username="${AUDIT_ANALYTICS_DB_USER_NAME}" password="${AUDIT_ANALYTICS_DB_PASSWORD}"
{{- else }}
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
{{- end }}
driverClassName="org.postgresql.Driver"
accessToUnderlyingConnectionAllowed = "true"
validationQuery="SELECT 1"
testOnBorrow="true"
defaultReadOnly="true"
defaultAutoCommit="false"
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
/>
{{- end }}
<Resource name="jdbc/sugarcrm" auth="Container" type="javax.sql.DataSource"
Expand Down
6 changes: 6 additions & 0 deletions jaspersoft-containers/OpenShift/jrs/helm/templates/db-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,10 @@ data:
AUDIT_DB_USER_NAME: {{ .Values.db.audit.dbUserName | toString | b64enc | quote }}
AUDIT_DB_PASSWORD: {{ .Values.db.audit.dbPassword | toString | b64enc | quote }}
{{- end }}
{{- if .Values.db.jndiRestrictedAccess }}
ANALYTICS_DB_USER_NAME: {{ .Values.db.analytics.dbUserName | toString | b64enc | quote }}
ANALYTICS_DB_PASSWORD: {{ .Values.db.analytics.dbPassword | toString | b64enc | quote }}
AUDIT_ANALYTICS_DB_USER_NAME: {{ .Values.db.auditAnalytics.dbUserName | toString | b64enc | quote }}
AUDIT_ANALYTICS_DB_PASSWORD: {{ .Values.db.auditAnalytics.dbPassword | toString | b64enc | quote }}
{{- end}}
{{- end}}
Loading