Skip to content

Commit 9944f3b

Browse files
himanshu3663himanshu3663
authoredMay 2, 2024
Merge pull request #95 from TIBCOSoftware/release9.0.0hf1
Release9.0.0hf1
2 parents 8e1f3b8 + 789a678 commit 9944f3b

22 files changed

+106
-191
lines changed
 

‎jaspersoft-containers/K8s/jrs/README.md

+5-10
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,10 @@ These parameters and values are the same as parameters in `K8s/jrs/helm/values.y
151151
| autoscaling.targetCPUUtilizationPercentage | Minimum CPU utilization to scale up the application | 50% |
152152
| autoscaling.targetMemoryUtilizationPercentage | Minimum memory utilization to scale up the JasperReports® Server applications | 50% |
153153
| autoscaling.scaleDown.stabilizationWindowSeconds | Time to give JasperReports® Server Webapp pod to finish all current tasks | 300 |
154-
| metrics.enabled | Enables the Prometheus metrics | false |
155-
| kube-prometheus-stack.prometheus-node-exporter.hostRootFsMount | | false |
154+
| metrics.enabled | Enables the Prometheus metrics | false |
156155
| kube-prometheus-stack.grafana.service.type | Grafana service type | NodePort |
157-
| logging.enabled | Enables the centralized logging setup | false |
158-
| elasticsearch.volumeClaimTemplate.resources.requests.storage | | 10Gi |
159-
| kibana.service.type | Kibana service type | NodePort |
160-
| elasticsearch.replicas | Number of replicas for Elasticsearch | 1 |
156+
| logging.enabled | Enables the centralized logging setup | false |
157+
| kibana.service.type | Kibana service type | NodePort |
161158
| tolerations | Adds the tolerations as per K8s standard if needed | null |
162159
| affinity | Adds the affinity as per K8s standards if needed | null |
163160

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

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

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

373-
**Note:** If any changes are done in the Elasticsearch chart for cluster name and port then the same must be updated accordingly for Fluentd.
369+
**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.
374370

375371
## Repository DB Does Not Exist
376372

@@ -511,7 +507,6 @@ In case if you want to control traffic on AWS Application Load Balancer side ins
511507
helm repo add bitnami https://charts.bitnami.com/bitnami
512508
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
513509
helm repo add haproxytech https://haproxytech.github.io/helm-charts
514-
helm repo add elastic https://helm.elastic.co
515510
516511
15. Run ``helm dependencies update jrs/helm``.
517512
16. Install the PostgreSQL chart:

‎jaspersoft-containers/K8s/jrs/helm/Chart.lock

+5-8
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@ dependencies:
44
version: 1.29.3
55
- name: kube-prometheus-stack
66
repository: https://prometheus-community.github.io/helm-charts
7-
version: 16.0.1
7+
version: 56.3.0
88
- name: elasticsearch
9-
repository: https://helm.elastic.co
10-
version: 7.12.0
11-
- name: kibana
12-
repository: https://helm.elastic.co
13-
version: 7.12.0
9+
repository: https://charts.bitnami.com/bitnami
10+
version: 19.17.2
1411
- name: scalable-query-engine
1512
repository: file://../../scalableQueryEngine/helm
1613
version: 1.0.0
17-
digest: sha256:fdcc8d54046046394473b3235c434bea30ff1beb1411d32a7976fdaacddec707
18-
generated: "2023-04-18T21:04:35.6321472+05:30"
14+
digest: sha256:81777879508a46ba9d340c5f8f545ec2877da61c38635945d0ae58c9a75f7ea4
15+
generated: "2024-04-10T10:05:05.3822647+05:30"

‎jaspersoft-containers/K8s/jrs/helm/Chart.yaml

+3-8
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,13 @@ dependencies:
2121
condition: ingress.enabled
2222

2323
- name: kube-prometheus-stack
24-
version: ~16.0.1
24+
version: 56.3.0
2525
repository: "@prometheus-community"
2626
condition: metrics.enabled
2727

2828
- name: elasticsearch
29-
version: 7.12.0
30-
repository: "@elastic"
31-
condition: logging.enabled
32-
33-
- name: kibana
34-
version: 7.12.0
35-
repository: "@elastic"
29+
version: 19.17.2
30+
repository: "https://charts.bitnami.com/bitnami"
3631
condition: logging.enabled
3732

3833
- name: scalable-query-engine

‎jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-19.17.2.tgz

109 KB
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/charts/elasticsearch-7.12.0.tgz

-26.6 KB
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/charts/kibana-7.12.0.tgz

-9.77 KB
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz

-292 KB
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/charts/kube-prometheus-stack-56.3.0.tgz

502 KB
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/charts/scalable-query-engine-1.0.0.tgz

420 Bytes
Binary file not shown.

‎jaspersoft-containers/K8s/jrs/helm/templates/fluentd.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ spec:
6363
image: {{ .Values.logging.fluentd.imageName }}:{{ .Values.logging.fluentd.imageTag }}
6464
env:
6565
- name: FLUENT_ELASTICSEARCH_HOST
66-
value: "{{ .Values.logging.fluentd.esClusterName }}-master.{{.Release.Namespace }}.svc.cluster.local"
66+
value: "{{ .Release.Name }}-elasticsearch.{{.Release.Namespace }}.svc.cluster.local"
6767
- name: FLUENT_ELASTICSEARCH_PORT
6868
value: "{{ .Values.logging.fluentd.esPort }}"
6969
- name: FLUENT_ELASTICSEARCH_SCHEME
7070
value: "http"
7171
- name: FLUENTD_SYSTEMD_CONF
7272
value: disable
73+
- name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
74+
value: cri
75+
- name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
76+
value: /var/log/containers/fluent*
7377
resources:
7478
limits:
7579
memory: 512Mi

‎jaspersoft-containers/K8s/jrs/helm/values.yaml

+7-10
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,6 @@ metrics:
289289
enabled: false
290290

291291
kube-prometheus-stack:
292-
prometheus-node-exporter:
293-
hostRootFsMount: false
294292
grafana:
295293
service:
296294
type: NodePort
@@ -307,17 +305,16 @@ logging:
307305
# Elastic search configuration for logging
308306

309307
elasticsearch:
310-
replicas: 1
311-
volumeClaimTemplate:
312-
resources:
313-
requests:
314-
storage: 10Gi
315-
316-
## Visualization for logging
317-
kibana:
318308
service:
319309
type: NodePort
320310

311+
## Visualization for logging
312+
global:
313+
kibanaEnabled: true
314+
kibana:
315+
service:
316+
type: NodePort
317+
321318
## Tolerations for JRS webapp
322319
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
323320

‎jaspersoft-containers/OpenShift/jrs/README.md

+15
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ These parameters and values are the same as parameters in values.yaml.
7676
| db.audit.dbName | JasperReports Server audit DB name | jasperserver |
7777
| db.audit.dbUserName | JasperReports Server audit DB user name | postgres |
7878
| db.audit.dbPassword | JasperReports Server audit DB password | postgres |
79+
| 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 |
80+
| db.analytics.dbUserName | JasperReports® Server analytics read-only DB username, used when secrets enabled | postgres |
81+
| db.analytics.dbPassword | JasperReports® Server analytics read-only DB password, used when secrets enabled | postgres |
82+
| db.auditAnalytics.dbUserName | JasperReports® Server Audit Analytics read-only DB username, used when secrets enabled | postgres |
83+
| db.auditAnalytics.dbPassword | JasperReports® Server Audit Analytics read-only DB password, used when secrets enabled | postgres |
7984
| extraEnv.javaopts | Adds all JAVA_OPTS | -XX:+UseContainerSupport -XX:MinRAMPercentage=33.0 -XX:MaxRAMPercentage=75.0 |
8085
| extraEnv.normal | Adds all the normal key value pair variables | null |
8186
| extraEnv.secrets | Adds all the environment references from secrets or configmaps| null |
@@ -343,6 +348,16 @@ To get the host name, run the below command:
343348

344349
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.
345350

351+
## Logging and Monitoring Configuration
352+
353+
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:
354+
355+
- [OpenShift Documentation](https://docs.openshift.com/container-platform/4.11/welcome/index.html)
356+
357+
- [Monitoring in OpenShift](https://docs.openshift.com/container-platform/4.11/virt/logging_events_monitoring/virt-openshift-cluster-monitoring.html)
358+
359+
- [About Logging](https://docs.openshift.com/container-platform/4.11/logging/cluster-logging.html#cluster-logging)
360+
346361
# Integrating the Scalable Query Engine and JasperReports® Server
347362

348363
1. Enable the Scalable Query Engine to be installed by changing the `scalableQueryEngine.enabled = true`.

‎jaspersoft-containers/OpenShift/jrs/helm/Chart.lock

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
dependencies:
2-
- name: kube-prometheus-stack
3-
repository: https://prometheus-community.github.io/helm-charts
4-
version: 16.0.1
5-
- name: elasticsearch
6-
repository: https://helm.elastic.co
7-
version: 7.12.0
8-
- name: kibana
9-
repository: https://helm.elastic.co
10-
version: 7.12.0
112
- name: scalable-query-engine
123
repository: file://../../scalableQueryEngine/helm
134
version: 1.0.0
14-
digest: sha256:6cc5582e010b7b299e7d6db3923de1553e0597473982201a71155c9cc268850a
15-
generated: "2021-08-24T12:29:45.8782614+05:30"
5+
digest: sha256:f4f39bc099039cfaf5d91949f1cebca86172757dd23043140977e7d942f9d33b
6+
generated: "2024-04-25T21:12:11.0758453+05:30"

‎jaspersoft-containers/OpenShift/jrs/helm/Chart.yaml

-15
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ maintainers:
1515
url: https://www.jaspersoft.com/
1616

1717
dependencies:
18-
- name: kube-prometheus-stack
19-
version: ~16.0.1
20-
repository: "@prometheus-community"
21-
condition: metrics.enabled
22-
23-
- name: elasticsearch
24-
version: 7.12.0
25-
repository: "@elastic"
26-
condition: logging.enabled
27-
28-
- name: kibana
29-
version: 7.12.0
30-
repository: "@elastic"
31-
condition: logging.enabled
32-
3318
- name: scalable-query-engine
3419
version: "1.0.0"
3520
repository: "file://../../scalableQueryEngine/helm"

‎jaspersoft-containers/OpenShift/jrs/helm/charts/elasticsearch-7.12.0.tgz

-26.6 KB
Binary file not shown.

‎jaspersoft-containers/OpenShift/jrs/helm/charts/kibana-7.12.0.tgz

-9.77 KB
Binary file not shown.

‎jaspersoft-containers/OpenShift/jrs/helm/charts/kube-prometheus-stack-16.0.1.tgz

-292 KB
Binary file not shown.

‎jaspersoft-containers/OpenShift/jrs/helm/charts/scalable-query-engine-1.0.0.tgz

1.83 KB
Binary file not shown.

‎jaspersoft-containers/OpenShift/jrs/helm/templates/db-configmap.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ data:
1818
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
1919
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
2020
/>
21+
<Resource name="jdbc/jasperserverSystemAnalytics" auth="Container" type="javax.sql.DataSource"
22+
maxActive="100" maxIdle="30" maxWait="10000"
23+
{{- if .Values.db.jndiRestrictedAccess }}
24+
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
25+
{{- else }}
26+
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
27+
{{- end }}
28+
driverClassName="org.postgresql.Driver"
29+
accessToUnderlyingConnectionAllowed = "true"
30+
validationQuery="SELECT 1"
31+
testOnBorrow="true"
32+
defaultReadOnly="true"
33+
defaultAutoCommit="false"
34+
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
35+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
36+
/>
2137
{{- if .Values.db.audit.enabled }}
2238
<Resource name="jdbc/jasperserverAudit" auth="Container" type="javax.sql.DataSource"
2339
maxActive="100" maxIdle="30" maxWait="10000"
@@ -39,6 +55,41 @@ data:
3955
testOnBorrow="true"
4056
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
4157
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
58+
/>
59+
{{- end }}
60+
{{- if .Values.db.audit.enabled }}
61+
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
62+
maxActive="100" maxIdle="30" maxWait="10000"
63+
{{- if .Values.db.jndiRestrictedAccess }}
64+
username="${ANALYTICS_DB_USER_NAME}" password="${ANALYTICS_DB_PASSWORD}"
65+
{{- else }}
66+
username="${AUDIT_DB_USER_NAME}" password="${AUDIT_DB_PASSWORD}"
67+
{{- end }}
68+
driverClassName="org.postgresql.Driver"
69+
accessToUnderlyingConnectionAllowed = "true"
70+
validationQuery="SELECT 1"
71+
testOnBorrow="true"
72+
defaultReadOnly="true"
73+
defaultAutoCommit="false"
74+
url="jdbc:postgresql://${AUDIT_DB_HOST}:${AUDIT_DB_PORT}/${AUDIT_DB_NAME}"
75+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
76+
/>
77+
{{- else if semverCompare ">= 9.0.0" .Values.jrsVersion }}
78+
<Resource name="jdbc/jasperserverAuditAnalytics" auth="Container" type="javax.sql.DataSource"
79+
maxActive="100" maxIdle="30" maxWait="10000"
80+
{{- if .Values.db.jndiRestrictedAccess }}
81+
username="${AUDIT_ANALYTICS_DB_USER_NAME}" password="${AUDIT_ANALYTICS_DB_PASSWORD}"
82+
{{- else }}
83+
username="${DB_USER_NAME}" password="${DB_PASSWORD}"
84+
{{- end }}
85+
driverClassName="org.postgresql.Driver"
86+
accessToUnderlyingConnectionAllowed = "true"
87+
validationQuery="SELECT 1"
88+
testOnBorrow="true"
89+
defaultReadOnly="true"
90+
defaultAutoCommit="false"
91+
url="jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}"
92+
factory="com.jaspersoft.jasperserver.tomcat.jndi.JSCommonsBasicDataSourceFactory"
4293
/>
4394
{{- end }}
4495
<Resource name="jdbc/sugarcrm" auth="Container" type="javax.sql.DataSource"

‎jaspersoft-containers/OpenShift/jrs/helm/templates/db-secret.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@ data:
1919
AUDIT_DB_USER_NAME: {{ .Values.db.audit.dbUserName | toString | b64enc | quote }}
2020
AUDIT_DB_PASSWORD: {{ .Values.db.audit.dbPassword | toString | b64enc | quote }}
2121
{{- end }}
22+
{{- if .Values.db.jndiRestrictedAccess }}
23+
ANALYTICS_DB_USER_NAME: {{ .Values.db.analytics.dbUserName | toString | b64enc | quote }}
24+
ANALYTICS_DB_PASSWORD: {{ .Values.db.analytics.dbPassword | toString | b64enc | quote }}
25+
AUDIT_ANALYTICS_DB_USER_NAME: {{ .Values.db.auditAnalytics.dbUserName | toString | b64enc | quote }}
26+
AUDIT_ANALYTICS_DB_PASSWORD: {{ .Values.db.auditAnalytics.dbPassword | toString | b64enc | quote }}
27+
{{- end}}
2228
{{- end}}

‎jaspersoft-containers/OpenShift/jrs/helm/templates/fluentd.yaml

-93
This file was deleted.

‎jaspersoft-containers/OpenShift/jrs/helm/values.yaml

+7-35
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ db:
8585
dbName:
8686
dbUserName:
8787
dbPassword:
88-
88+
jndiRestrictedAccess: false
89+
analytics:
90+
dbUserName: postgres
91+
dbPassword: postgres
92+
auditAnalytics:
93+
dbUserName: postgres
94+
dbPassword: postgres
8995
## Set env variables
9096
## ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
9197
## ref: https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables
@@ -251,40 +257,6 @@ autoscaling:
251257
scaleDown:
252258
stabilizationWindowSeconds: 300
253259

254-
# Configure the default cluster level metrics for jasperserver webapp using prometheus operator
255-
256-
metrics:
257-
enabled: false
258-
259-
kube-prometheus-stack:
260-
prometheus-node-exporter:
261-
hostRootFsMount: false
262-
grafana:
263-
service:
264-
type: NodePort
265-
266-
# To enable centralized logging using EFK stack
267-
logging:
268-
enabled: false
269-
fluentd:
270-
imageName: fluent/fluentd-kubernetes-daemonset
271-
imageTag: v1.12.3-debian-elasticsearch7-1.0
272-
esClusterName: elasticsearch
273-
esPort: 9200
274-
275-
# Elastic search configuration for logging
276-
277-
elasticsearch:
278-
replicas: 1
279-
volumeClaimTemplate:
280-
resources:
281-
requests:
282-
storage: 10Gi
283-
284-
## Visualization for logging
285-
kibana:
286-
service:
287-
type: NodePort
288260

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

0 commit comments

Comments
 (0)
Please sign in to comment.