Skip to content

Commit a7adea1

Browse files
MikeShi42MikeShi42
authored
Merge branch 'v2' into ernest/hdx-1691-prevent-source-settings-from-being-too-easily-modified
2 parents 366b991 + 1155407 commit a7adea1

File tree

79 files changed

+3128
-1246
lines changed

Some content is hidden

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

79 files changed

+3128
-1246
lines changed

‎.changeset/few-mails-check.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/api": patch
4+
"@hyperdx/app": patch
5+
---
6+
7+
fix: alerting time range filtering bug

‎.changeset/heavy-chicken-share.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/api": patch
4+
"@hyperdx/app": patch
5+
---
6+
7+
feat: add summary and exponential histogram metrics to the source form and database storage

‎.changeset/orange-carrots-cheer.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/api": patch
4+
"@hyperdx/app": patch
5+
---
6+
7+
adopt clickhouse-js for all client side queries

‎.changeset/tricky-bees-hide.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@hyperdx/app": patch
3+
"@hyperdx/api": patch
4+
"@hyperdx/common-utils": patch
5+
---
6+
7+
feat: introduce all-one-one (auth vs noauth) multi-stage build

‎.changeset/twelve-dolls-yell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
---
4+
5+
feat: support 'dateRangeEndInclusive' in timeFilterExpr

‎.changeset/warm-keys-play.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@hyperdx/common-utils": patch
3+
"@hyperdx/api": patch
4+
---
5+
6+
Fix histogram query metric to support grouping and correct issues with value computation.

‎.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx
44
IMAGE_NAME_HDX=docker.hyperdx.io/hyperdx/hyperdx
55
LOCAL_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-local
66
LOCAL_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-local
7+
ALL_IN_ONE_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-all-in-one
8+
ALL_IN_ONE_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-all-in-one
79
OTEL_COLLECTOR_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-otel-collector
810
OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-otel-collector
911
CHANGESET_TAG=2.0.0-beta.16

‎.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ jobs:
5050
strategy:
5151
matrix:
5252
release:
53+
- release-all-in-one
5354
- release-app
54-
- release-otel-collector
5555
- release-local
56-
- release-local-ui
57-
# - release-extended-app
56+
- release-otel-collector
5857
steps:
5958
- name: Checkout
6059
uses: actions/checkout@v4

‎Makefile

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,54 +71,58 @@ dev-migrate-db:
7171
version:
7272
sh ./version.sh
7373

74+
.PHONY: release-otel-collector
75+
release-otel-collector:
76+
docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
77+
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
78+
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
79+
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
80+
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
81+
--target prod \
82+
--push \
83+
--cache-from=type=gha \
84+
--cache-to=type=gha,mode=max
85+
7486
.PHONY: release-local
7587
release-local:
76-
docker buildx build --squash . -f ./docker/local/Dockerfile \
88+
docker buildx build --squash . -f ./docker/hyperdx/Dockerfile \
7789
--build-context clickhouse=./docker/clickhouse \
7890
--build-context otel-collector=./docker/otel-collector \
79-
--build-context local=./docker/local \
91+
--build-context hyperdx=./docker/hyperdx \
8092
--build-context api=./packages/api \
8193
--build-context app=./packages/app \
8294
--platform ${BUILD_PLATFORMS} \
8395
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
8496
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
8597
-t ${LOCAL_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
8698
-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
99+
--target all-in-one-noauth \
87100
--push \
88101
--cache-from=type=gha \
89102
--cache-to=type=gha,mode=max
90103

91-
.PHONY: release-local-ui
92-
release-local-ui:
93-
docker buildx build . -f ./packages/app/Dockerfile \
94-
--build-arg IS_LOCAL_MODE=true \
95-
--build-arg PORT=${HYPERDX_APP_PORT} \
96-
--target prod \
104+
.PHONY: release-all-in-one
105+
release-all-in-one:
106+
docker buildx build --squash . -f ./docker/hyperdx/Dockerfile \
107+
--build-context clickhouse=./docker/clickhouse \
108+
--build-context otel-collector=./docker/otel-collector \
109+
--build-context hyperdx=./docker/hyperdx \
110+
--build-context api=./packages/api \
111+
--build-context app=./packages/app \
97112
--platform ${BUILD_PLATFORMS} \
98-
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG}-ui \
99-
-t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG}-ui \
100-
-t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG}-ui \
101-
-t ${LOCAL_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG}-ui \
102-
--push \
103-
--cache-from=type=gha \
104-
--cache-to=type=gha,mode=max
105-
106-
.PHONY: release-otel-collector
107-
release-otel-collector:
108-
docker buildx build --platform ${BUILD_PLATFORMS} ./docker/otel-collector \
109-
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
110-
-t ${OTEL_COLLECTOR_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
111-
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
112-
-t ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
113-
--target prod \
113+
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG} \
114+
-t ${ALL_IN_ONE_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
115+
-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG} \
116+
-t ${ALL_IN_ONE_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG} \
117+
--target all-in-one-auth \
114118
--push \
115119
--cache-from=type=gha \
116120
--cache-to=type=gha,mode=max
117121

118122
.PHONY: release-app
119123
release-app:
120-
docker buildx build --squash . -f ./docker/fullstack/Dockerfile \
121-
--build-context fullstack=./docker/fullstack \
124+
docker buildx build --squash . -f ./docker/hyperdx/Dockerfile \
125+
--build-context hyperdx=./docker/hyperdx \
122126
--build-context api=./packages/api \
123127
--build-context app=./packages/app \
124128
--platform ${BUILD_PLATFORMS} \
@@ -131,15 +135,19 @@ release-app:
131135
--cache-from=type=gha \
132136
--cache-to=type=gha,mode=max
133137

134-
.PHONY: release-extended-app
135-
release-extended-app:
136-
docker buildx build --squash . -f ./docker/fullstack/Dockerfile \
137-
--build-context fullstack=./docker/fullstack \
138-
--build-context api=./packages/api \
139-
--build-context app=./packages/app \
140-
--platform ${BUILD_PLATFORMS} \
141-
-t ${IMAGE_NAME_DOCKERHUB}:latest \
142-
--target prod-extended \
143-
--push \
144-
--cache-from=type=gha \
145-
--cache-to=type=gha,mode=max
138+
# DEPRECATED
139+
# .PHONY: release-local-ui
140+
# release-local-ui:
141+
# docker buildx build . -f ./packages/app/Dockerfile \
142+
# --build-arg IS_LOCAL_MODE=true \
143+
# --build-arg PORT=${HYPERDX_APP_PORT} \
144+
# --target prod \
145+
# --platform ${BUILD_PLATFORMS} \
146+
# -t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG}-ui \
147+
# -t ${LOCAL_IMAGE_NAME_DOCKERHUB}:${IMAGE_NIGHTLY_TAG}-ui \
148+
# -t ${LOCAL_IMAGE_NAME}:${IMAGE_VERSION}${IMAGE_VERSION_SUB_TAG}-ui \
149+
# -t ${LOCAL_IMAGE_NAME}:${IMAGE_NIGHTLY_TAG}-ui \
150+
# --push \
151+
# --cache-from=type=gha \
152+
# --cache-to=type=gha,mode=max
153+

‎docker-compose.dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ services:
5858
healthcheck:
5959
# "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
6060
test: wget --no-verbose --tries=1 http://127.0.0.1:8123/ping || exit 1
61-
interval: 3s
62-
timeout: 3s
63-
retries: 3
61+
interval: 1s
62+
timeout: 1s
63+
retries: 60
6464
networks:
6565
internal:

‎docker-compose.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ services:
4141
image: mongo:5.0.14-focal
4242
volumes:
4343
- .volumes/db:/data/db
44-
ports:
45-
- 27017:27017
44+
# WARNING: Exposing the database port will make it accessible from outside the container,
45+
# potentially allowing unauthorized access. If you uncomment the ports below,
46+
# ensure to secure your database (e.g., with strong authentication, proper network rules, and firewalls).
47+
# ports:
48+
# - 27017:27017
4649
networks:
4750
- internal
4851
otel-collector:
@@ -85,9 +88,12 @@ services:
8588
- db
8689
ch-server:
8790
image: clickhouse/clickhouse-server:24-alpine
88-
ports:
89-
- 8123:8123 # http api
90-
- 9000:9000 # native
91+
# WARNING: Exposing the database port will make it accessible from outside the container,
92+
# potentially allowing unauthorized access. If you uncomment the ports below,
93+
# ensure to secure your database (e.g., with strong authentication, proper network rules, and firewalls).
94+
# ports:
95+
# - 8123:8123 # http api
96+
# - 9000:9000 # native
9197
environment:
9298
# default settings
9399
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1

‎docker/fullstack/Dockerfile

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

‎docker/fullstack/entry.sh

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

0 commit comments

Comments
 (0)