Skip to content

Commit 05b9965

Browse files
nitishtnitisht
authored
Merge branch 'main' into kafka-integration
2 parents 4432ee2 + 80a3ff4 commit 05b9965

File tree

15 files changed

+291
-203
lines changed

15 files changed

+291
-203
lines changed

‎.github/workflows/coverage.yaml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
on:
2+
pull_request:
3+
paths-ignore:
4+
- "docs/**"
5+
- "helm/**"
6+
- "assets/**"
7+
- "**.md"
8+
push:
9+
branches:
10+
- main
11+
12+
name: Lint, Test and Coverage Report
13+
jobs:
14+
coverage:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- uses: dtolnay/rust-toolchain@stable
19+
with:
20+
components: clippy
21+
22+
- uses: Swatinem/rust-cache@v2
23+
with:
24+
shared-key: ${{ runner.os }}-cargo
25+
26+
- uses: taiki-e/install-action@v2
27+
with:
28+
tool: cargo-hack, cargo-llvm-cov, nextest
29+
30+
- name: Check with clippy
31+
run: cargo hack clippy --verbose --each-feature --no-dev-deps -- -D warnings
32+
33+
- name: Check docs
34+
run: cargo hack doc --verbose --no-deps --each-feature --no-dev-deps
35+
36+
- name: Doctests
37+
run: cargo hack --each-feature test --doc
38+
39+
- name: Tests
40+
run: cargo hack --each-feature llvm-cov --no-report nextest
41+
42+
- name: Genrate coverage report
43+
run: cargo llvm-cov report --lcov --output-path coverage.lcov
44+
45+
- name: Upload Coverage Report
46+
uses: coverallsapp/[email protected]
47+
with:
48+
github-token: ${{ secrets.GITHUB_TOKEN }}
49+
file: ./coverage.lcov
50+
parallel: true
51+
flag-name: run-${{ matrix.os }}-cargo
52+
53+
- name: Finish Coverage Report
54+
uses: coverallsapp/[email protected]
55+
with:
56+
github-token: ${{ secrets.GITHUB_TOKEN }}
57+
parallel-finished: true

‎.github/workflows/lint.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎helm-releases/parseable-1.6.4.tgz

49 KB
Binary file not shown.

‎helm/Chart.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: parseable
33
description: Helm chart for Parseable Server
44
type: application
5-
version: 1.6.3
5+
version: 1.6.4
66
appVersion: "v1.6.3"
77
maintainers:
88
- name: Parseable Team
@@ -18,3 +18,4 @@ dependencies:
1818
version: 0.48.0
1919
repository: https://fluent.github.io/helm-charts
2020
condition: fluent-bit.enabled
21+

‎helm/templates/ingestor-statefulset.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ spec:
5454
apiVersion: v1
5555
fieldPath: metadata.name
5656
{{- end }}
57-
{{- range $secret := .Values.parseable.s3ModeSecret }}
57+
58+
{{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
59+
{{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
5860
{{- range $key := $secret.keys }}
5961
{{- $envPrefix := $secret.prefix | default "" | upper }}
6062
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -65,7 +67,10 @@ spec:
6567
key: {{ $key }}
6668
{{- end }}
6769
{{- end }}
68-
{{- range $secret := .Values.parseable.blobModeSecret }}
70+
{{- end }}
71+
72+
{{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
73+
{{- range $secret := .Values.parseable.blobModeSecret.secrets }}
6974
{{- range $key := $secret.keys }}
7075
{{- $envPrefix := $secret.prefix | default "" | upper }}
7176
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -76,6 +81,7 @@ spec:
7681
key: {{ $key }}
7782
{{- end }}
7883
{{- end }}
84+
{{- end }}
7985
- name: P_MODE
8086
value: "ingest"
8187
ports:

‎helm/templates/querier-statefulset.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,15 @@ spec:
5252
fieldRef:
5353
apiVersion: v1
5454
fieldPath: metadata.name
55+
- name: P_MODE
56+
value: "query"
5557
{{- range $key, $value := .Values.parseable.env }}
5658
- name: {{ $key }}
5759
value: {{ tpl $value $ | quote }}
5860
{{- end }}
59-
{{- range $secret := .Values.parseable.s3ModeSecret }}
61+
62+
{{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
63+
{{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
6064
{{- range $key := $secret.keys }}
6165
{{- $envPrefix := $secret.prefix | default "" | upper }}
6266
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -67,13 +71,10 @@ spec:
6771
key: {{ $key }}
6872
{{- end }}
6973
{{- end }}
70-
- name: P_MODE
71-
value: "query"
72-
{{- if .Values.parseable.persistence.querier.enabled }}
73-
- name: P_HOT_TIER_DIR
74-
value: "/parseable/hot-tier"
7574
{{- end }}
76-
{{- range $secret := .Values.parseable.blobModeSecret }}
75+
76+
{{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
77+
{{- range $secret := .Values.parseable.blobModeSecret.secrets }}
7778
{{- range $key := $secret.keys }}
7879
{{- $envPrefix := $secret.prefix | default "" | upper }}
7980
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -84,6 +85,7 @@ spec:
8485
key: {{ $key }}
8586
{{- end }}
8687
{{- end }}
88+
{{- end }}
8789
ports:
8890
- containerPort: 8000
8991
{{- with .Values.readinessProbe }}

‎helm/templates/standalone-deployment.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ spec:
4747
- name: {{ $key }}
4848
value: {{ tpl $value $ | quote }}
4949
{{- end }}
50-
{{- if .Values.parseable.localModeSecret }}
51-
{{- range $secret := .Values.parseable.localModeSecret }}
50+
{{- if and .Values.parseable.localModeSecret .Values.parseable.localModeSecret.enabled }}
51+
{{- range $secret := .Values.parseable.localModeSecret.secrets }}
5252
{{- range $key := $secret.keys }}
5353
{{- $envPrefix := $secret.prefix | default "" | upper }}
5454
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -59,8 +59,10 @@ spec:
5959
key: {{ $key }}
6060
{{- end }}
6161
{{- end }}
62-
{{- else }}
63-
{{- range $secret := .Values.parseable.s3ModeSecret }}
62+
{{- end }}
63+
64+
{{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
65+
{{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
6466
{{- range $key := $secret.keys }}
6567
{{- $envPrefix := $secret.prefix | default "" | upper }}
6668
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -72,7 +74,9 @@ spec:
7274
{{- end }}
7375
{{- end }}
7476
{{- end }}
75-
{{- range $secret := .Values.parseable.blobModeSecret }}
77+
78+
{{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
79+
{{- range $secret := .Values.parseable.blobModeSecret.secrets }}
7680
{{- range $key := $secret.keys }}
7781
{{- $envPrefix := $secret.prefix | default "" | upper }}
7882
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -83,6 +87,7 @@ spec:
8387
key: {{ $key }}
8488
{{- end }}
8589
{{- end }}
90+
{{- end }}
8691
ports:
8792
- containerPort: 8000
8893
{{- with .Values.readinessProbe }}

‎helm/values.yaml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -77,46 +77,45 @@ parseable:
7777
## blobModeSecret if store is set to blob-store
7878
## s3ModeSecret if store is set to s3-store
7979
localModeSecret:
80-
- type: env
81-
name: parseable-env-secret
82-
prefix: P_
83-
keys:
84-
- addr
85-
- username
86-
- password
87-
- staging.dir
88-
- fs.dir
89-
# blobModeSecret:
90-
# - type: env
91-
# name: parseable-env-secret
92-
# prefix: p_
93-
# keys:
94-
# - addr
95-
# - username
96-
# - password
97-
# - azr.access_key
98-
# - azr.account
99-
# - azr.container
100-
# - azr.url
101-
# s3ModeSecret:
102-
# - type: env
103-
# name: parseable-env-secret
104-
# prefix: P_
105-
# keys:
106-
# ## Comment / uncomment the following lines as required
107-
# # - tls.cert.path
108-
# # - tls.key.path
109-
# # - storage.upload.interval
110-
# - addr
111-
# - username
112-
# - password
113-
# - staging.dir
114-
# - fs.dir
115-
# - s3.url
116-
# - s3.access.key
117-
# - s3.secret.key
118-
# - s3.bucket
119-
# - s3.region
80+
enabled: false
81+
secrets:
82+
- name: parseable-env-secret
83+
prefix: P_
84+
keys:
85+
- addr
86+
- username
87+
- password
88+
- staging.dir
89+
- fs.dir
90+
blobModeSecret:
91+
enabled: false
92+
secrets:
93+
- name: parseable-env-secret
94+
prefix: P_
95+
keys:
96+
- addr
97+
- username
98+
- password
99+
- azr.access_key
100+
- azr.account
101+
- azr.container
102+
- azr.url
103+
s3ModeSecret:
104+
enabled: false
105+
secrets:
106+
- name: parseable-env-secret
107+
prefix: P_
108+
keys:
109+
- addr
110+
- username
111+
- password
112+
- staging.dir
113+
- fs.dir
114+
- s3.url
115+
- s3.access.key
116+
- s3.secret.key
117+
- s3.bucket
118+
- s3.region
120119
serviceAccount:
121120
create: true
122121
name: "parseable"
@@ -298,6 +297,7 @@ vector:
298297
fluent-bit:
299298
enabled: true
300299
kind: DaemonSet
300+
serverHost: parseable.parseable.svc.cluster.local
301301
replicaCount: 1
302302
image:
303303
repository: parseable/fluent-bit
@@ -383,7 +383,7 @@ fluent-bit:
383383
[OUTPUT]
384384
Name parseable
385385
Match kube.*
386-
Server_Host parseable.parseable.svc.cluster.local
386+
Server_Host {{ .Values.serverHost }}
387387
Username admin
388388
Password admin
389389
Server_Port 80
@@ -393,7 +393,7 @@ fluent-bit:
393393
[OUTPUT]
394394
Name parseable
395395
Match k8s_events
396-
Server_Host parseable.parseable.svc.cluster.local
396+
Server_Host {{ .Values.serverHost }}
397397
Server_Port 80
398398
Username admin
399399
Password admin

0 commit comments

Comments
 (0)