Skip to content

Commit d6bf385

Browse files
pravallikavaddpravallikavadd
committed
updated EFK and prometheus versions
1 parent 6f6b56a commit d6bf385

File tree

11 files changed

+25
-37
lines changed

11 files changed

+25
-37
lines changed

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

Lines changed: 5 additions & 10 deletions
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‎

Lines changed: 5 additions & 8 deletions
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‎

Lines changed: 3 additions & 8 deletions
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‎

Lines changed: 5 additions & 1 deletion
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

0 commit comments

Comments
 (0)