Skip to content

Commit a7de8c4

Browse files
author
Devdutt Shenoi
authored
Merge branch 'main' into hottier-perf
2 parents 6c7356e + 750140b commit a7de8c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1081
-982
lines changed

.github/workflows/build.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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: Ensure parseable builds on all release targets
13+
jobs:
14+
build-linux:
15+
name: Build for ${{matrix.target}}
16+
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
target:
21+
- aarch64-unknown-linux-gnu # linux(arm)
22+
- x86_64-unknown-linux-gnu # linux(64 bit)
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
27+
- uses: actions-rs/toolchain@v1
28+
with:
29+
toolchain: stable
30+
profile: minimal # minimal component installation (ie, no documentation)
31+
target: ${{ matrix.target }}
32+
override: true
33+
34+
- uses: actions-rs/cargo@v1
35+
with:
36+
use-cross: true
37+
command: build
38+
args: --target ${{matrix.target}}
39+
40+
build-windows:
41+
name: Build for windows
42+
runs-on: windows-latest
43+
44+
steps:
45+
- uses: actions/checkout@v2
46+
47+
- uses: actions-rs/toolchain@v1
48+
with:
49+
toolchain: stable
50+
profile: minimal # minimal component installation (ie, no documentation)
51+
default: true
52+
override: true
53+
54+
- name: Build on windows
55+
run: cargo build --target x86_64-pc-windows-msvc
56+
57+
build-macos:
58+
name: Build for ${{matrix.target}}
59+
runs-on: macos-latest
60+
strategy:
61+
matrix:
62+
target:
63+
- aarch64-apple-darwin # macos(arm)
64+
- x86_64-apple-darwin # macos(intel 64 bit)
65+
66+
steps:
67+
- uses: actions/checkout@v2
68+
- uses: actions-rs/toolchain@v1
69+
with:
70+
toolchain: stable
71+
profile: minimal
72+
target: ${{ matrix.target }}
73+
override: true
74+
75+
- name: Build on ${{ matrix.target }}
76+
run: cargo build --target ${{ matrix.target }}

Cargo.lock

Lines changed: 1 addition & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ actix-web-prometheus = { version = "0.1" }
2727
actix-web-static-files = "4.0"
2828
http = "0.2.7"
2929
http-auth-basic = "0.3.3"
30-
mime = "0.3.17"
3130
tonic = { version = "0.12.3", features = ["tls", "transport", "gzip", "zstd"] }
3231
tonic-web = "0.12.3"
3332
tower-http = { version = "0.6.1", features = ["cors"] }
@@ -45,7 +44,6 @@ sha2 = "0.10.8"
4544

4645
# Serialization and Data Formats
4746
byteorder = "1.4.3"
48-
prost = "0.13.3"
4947
serde = { version = "1.0", features = ["rc", "derive"] }
5048
serde_json = "1.0"
5149
serde_repr = "0.1.17"
@@ -75,11 +73,9 @@ humantime = "2.1.0"
7573
humantime-serde = "1.1"
7674

7775
# File System and I/O
78-
bzip2 = { version = "*", features = ["static"] }
7976
fs_extra = "1.3"
8077
path-clean = "1.0.1"
8178
relative-path = { version = "1.7", features = ["serde"] }
82-
xz2 = { version = "*", features = ["static"] }
8379

8480
# CLI and System
8581
clap = { version = "4.1", default-features = false, features = [
@@ -96,15 +92,13 @@ hostname = "0.4.0"
9692
human-size = "0.4"
9793
num_cpus = "1.15"
9894
sysinfo = "0.31.4"
99-
thread-priority = "1.0.0"
10095
uptime_lib = "0.3.0"
10196

10297
# Utility Libraries
10398
anyhow = { version = "1.0", features = ["backtrace"] }
10499
bytes = "1.4"
105100
clokwerk = "0.4"
106101
derive_more = "0.99.18"
107-
hashlru = { version = "0.11.0", features = ["serde"] }
108102
itertools = "0.13.0"
109103
lazy_static = "1.4"
110104
nom = "7.1.3"
@@ -125,7 +119,6 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }
125119

126120
[build-dependencies]
127121
cargo_toml = "0.20.1"
128-
prost-build = "0.13.3"
129122
sha1_smol = { version = "1.0", features = ["std"] }
130123
static-files = "0.2"
131124
ureq = "2.6"
@@ -134,16 +127,12 @@ vergen = { version = "8.1", features = ["build", "git", "cargo", "gitcl"] }
134127
zip = { version = "2.2.0", default-features = false, features = ["deflate"] }
135128

136129
[dev-dependencies]
137-
maplit = "1.0"
138130
rstest = "0.23.0"
139131
arrow = "53.0.0"
140132

141133
[package.metadata.parseable_ui]
142-
assets-url = "https://github.com/parseablehq/console/releases/download/v0.9.17/build.zip"
143-
assets-sha1 = "f1b9fc08e6dceccf66b00e5f427022d67d95cd96"
144-
145-
[features]
146-
debug = []
134+
assets-url = "https://github.com/parseablehq/console/releases/download/v0.9.18/build.zip"
135+
assets-sha1 = "4516db38c8e556707b29b33569f9b1e53d5165f2"
147136

148137
[profile.release-lto]
149138
inherits = "release"
@@ -155,4 +144,4 @@ codegen-units = 1
155144
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
156145

157146
[target.'cfg(all(target_os = "macos", target_arch = "aarch64"))'.dependencies]
158-
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
147+
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }

Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0"
2323

2424
WORKDIR /parseable
2525
COPY . .
26-
RUN cargo build --features debug
26+
RUN cargo build
2727

2828
# final stage
2929
FROM docker.io/debian:bookworm-slim

helm-releases/parseable-1.7.3.tgz

50.2 KB
Binary file not shown.

helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: parseable
33
description: Helm chart for Parseable Server
44
type: application
5-
version: 1.7.2
6-
appVersion: "v1.7.2"
5+
version: 1.7.3
6+
appVersion: "v1.7.3"
77
icon: "https://raw.githubusercontent.com/parseablehq/.github/main/images/logo.svg"
88
maintainers:
99
- name: Parseable Team

helm/templates/ingestor-statefulset.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ metadata:
1818
name: {{ include "parseable.fullname" . }}-ingestor
1919
namespace: {{ .Release.Namespace }}
2020
labels:
21-
{{- include "parseable.ingestorLabels" . | nindent 4 }}
21+
{{- with .Values.parseable.highAvailability.ingestor.extraLabels }}
22+
{{- toYaml . | nindent 4 }}
23+
{{- end }}
2224
spec:
2325
selector:
2426
matchLabels:
@@ -32,6 +34,10 @@ spec:
3234
{{- .Values.parseable.highAvailability.ingestor.labels | toYaml | nindent 8 }}
3335
{{- include "parseable.ingestorLabelsSelector" . | nindent 8 }}
3436
spec:
37+
{{- with .Values.parseable.highAvailability.ingestor.affinity }}
38+
affinity:
39+
{{- toYaml . | nindent 8 }}
40+
{{- end }}
3541
initContainers:
3642
- name: wait-for-query-service
3743
image: curlimages/curl:latest # Lightweight image with curl

helm/templates/querier-statefulset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ spec:
4141
tolerations:
4242
{{ toYaml . | nindent 8 }}
4343
{{- end }}
44+
{{- with .Values.parseable.nodeSelector }}
45+
nodeSelector:
46+
{{- toYaml . | nindent 8 }}
47+
{{- end }}
4448
containers:
4549
- name: {{ .Chart.Name }}
4650
securityContext:

0 commit comments

Comments
 (0)