fix: Serve external resources like icons and fonts locally

.changeset/gentle-lamps-drop.md

@@ -0,0 +1,6 @@
+---
+'@hyperdx/api': patch
+'@hyperdx/app': patch
+---
+
+feat: Allow to update team name

.changeset/wise-wombats-hunt.md

@@ -0,0 +1,6 @@
+---
+'@hyperdx/app': patch
+'@hyperdx/api': patch
+---
+
+feat: Allow to set table headers and chart line names

.env

@@ -1,8 +1,9 @@
 # Used by docker-compose.yml
 IMAGE_NAME=ghcr.io/hyperdxio/hyperdx
+IMAGE_NAME_HDX=ghcr.hyperdx.io/hyperdxio/hyperdx
 LOCAL_IMAGE_NAME=ghcr.io/hyperdxio/hyperdx-local
 LOCAL_IMAGE_NAME_DOCKERHUB=hyperdx/hyperdx-local
-IMAGE_VERSION=1.10.0
+IMAGE_VERSION=1.10.1
 
 # Set up domain URLs
 HYPERDX_API_PORT=8000

.github/workflows/main.yml

@@ -10,7 +10,7 @@ concurrency:
 jobs:
   lint:
     timeout-minutes: 8
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -25,14 +25,14 @@ jobs:
       - name: Install vector
         run: |
           mkdir -p vector
-          curl -sSfL --proto '=https' --tlsv1.2 https://packages.timber.io/vector/0.41.1/vector-0.41.1-x86_64-unknown-linux-musl.tar.gz | tar xzf - -C vector --strip-components=2
+          curl -sSfL --proto '=https' --tlsv1.2 https://packages.timber.io/vector/0.43.1/vector-0.43.1-x86_64-unknown-linux-musl.tar.gz | tar xzf - -C vector --strip-components=2
           cp ./vector/bin/vector /usr/local/bin/vector
           vector --version
       - name: Run lint + type check
         run: make ci-lint
   unit:
     timeout-minutes: 8
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -46,7 +46,7 @@ jobs:
         run: make ci-unit
   integration:
     timeout-minutes: 8
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

Makefile

@@ -68,22 +68,22 @@ dev-migrate-db:
 
 .PHONY: build-local
 build-local:
-	docker build ./docker/hostmetrics -t ${IMAGE_NAME}:${LATEST_VERSION}-hostmetrics --target prod &
-	docker build ./docker/ingestor -t ${IMAGE_NAME}:${LATEST_VERSION}-ingestor --target prod &
-	docker build ./docker/otel-collector -t ${IMAGE_NAME}:${LATEST_VERSION}-otel-collector --target prod &
-	docker build --build-arg CODE_VERSION=${LATEST_VERSION} . -f ./packages/miner/Dockerfile -t ${IMAGE_NAME}:${LATEST_VERSION}-miner --target prod &
-	docker build --build-arg CODE_VERSION=${LATEST_VERSION} . -f ./packages/go-parser/Dockerfile -t ${IMAGE_NAME}:${LATEST_VERSION}-go-parser &
+	docker build ./docker/hostmetrics -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-hostmetrics --target prod &
+	docker build ./docker/ingestor -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-ingestor --target prod &
+	docker build ./docker/otel-collector -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-otel-collector --target prod &
+	docker build --build-arg CODE_VERSION=${LATEST_VERSION} . -f ./packages/miner/Dockerfile -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-miner --target prod &
+	docker build --build-arg CODE_VERSION=${LATEST_VERSION} . -f ./packages/go-parser/Dockerfile -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-go-parser &
 	docker build \
 		--build-arg CODE_VERSION=${LATEST_VERSION} \
 		--build-arg PORT=${HYPERDX_API_PORT} \
-		. -f ./packages/api/Dockerfile -t ${IMAGE_NAME}:${LATEST_VERSION}-api --target prod &
+		. -f ./packages/api/Dockerfile -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-api --target prod &
 	docker build \
 		--build-arg CODE_VERSION=${LATEST_VERSION} \
 		--build-arg OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT} \
 		--build-arg OTEL_SERVICE_NAME=${OTEL_SERVICE_NAME} \
 		--build-arg PORT=${HYPERDX_APP_PORT} \
 		--build-arg SERVER_URL=${HYPERDX_API_URL}:${HYPERDX_API_PORT} \
-		. -f ./packages/app/Dockerfile -t ${IMAGE_NAME}:${LATEST_VERSION}-app --target prod
+		. -f ./packages/app/Dockerfile -t ${IMAGE_NAME_HDX}:${LATEST_VERSION}-app --target prod
 
 .PHONY: version
 version:

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   go-parser:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-go-parser
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-go-parser
     container_name: hdx-oss-go-parser
     environment:
       AGGREGATOR_API_URL: 'http://aggregator:8001'
@@ -16,7 +16,7 @@ services:
     networks:
       - internal
   miner:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-miner
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-miner
     container_name: hdx-oss-miner
     environment:
       HYPERDX_API_KEY: ${HYPERDX_API_KEY}
@@ -30,7 +30,7 @@ services:
     networks:
       - internal
   hostmetrics:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-hostmetrics
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-hostmetrics
     container_name: hdx-oss-hostmetrics
     environment:
       HYPERDX_API_KEY: ${HYPERDX_API_KEY}
@@ -40,7 +40,7 @@ services:
     networks:
       - internal
   ingestor:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-ingestor
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-ingestor
     container_name: hdx-oss-ingestor
     volumes:
       - .volumes/ingestor_data:/var/lib/vector
@@ -76,7 +76,7 @@ services:
     networks:
       - internal
   otel-collector:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-otel-collector
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-otel-collector
     container_name: hdx-oss-otel-collector
     environment:
       HYPERDX_LOG_LEVEL: ${HYPERDX_LOG_LEVEL}
@@ -94,7 +94,7 @@ services:
     networks:
       - internal
   aggregator:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-api
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-api
     container_name: hdx-oss-aggregator
     ports:
       - 8001:8001
@@ -118,7 +118,7 @@ services:
       - redis
       - ch-server
   task-check-alerts:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-api
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-api
     container_name: hdx-oss-task-check-alerts
     entrypoint: 'node'
     command: './build/tasks/index.js check-alerts'
@@ -150,7 +150,7 @@ services:
       - db
       - redis
   api:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-api
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-api
     container_name: hdx-oss-api
     ports:
       - ${HYPERDX_API_PORT}:${HYPERDX_API_PORT}
@@ -185,7 +185,7 @@ services:
       - db
       - redis
   app:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-app
+    image: ${IMAGE_NAME_HDX}:${IMAGE_VERSION}-app
     container_name: hdx-oss-app
     ports:
       - ${HYPERDX_APP_PORT}:${HYPERDX_APP_PORT}

docker/ingestor/Dockerfile

@@ -1,5 +1,5 @@
 ## base #############################################################################################
-FROM timberio/vector:0.41.1-alpine AS base
+FROM timberio/vector:0.43.1-alpine AS base
 
 RUN mkdir -p /var/lib/vector
 VOLUME ["/var/lib/vector"]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hyperdx",
   "private": true,
-  "version": "1.10.0",
+  "version": "1.10.1",
   "license": "MIT",
   "workspaces": [
     "packages/*"

packages/api/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @hyperdx/api
 
+## 1.10.1
+
+### Patch Changes
+
+- e1d8409: fix: expandToNestedObject method bug (inconsistent top-level keys)
+- 9daccff: fix: should check team + service + name uniq constraint instead (adding webhook)
+
 ## 1.10.0
 
 ### Minor Changes

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperdx/api",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "license": "MIT",
   "private": true,
   "engines": {

packages/api/src/controllers/team.ts

@@ -61,6 +61,10 @@ export function rotateTeamApiKey(teamId: ObjectId) {
   return Team.findByIdAndUpdate(teamId, { apiKey: uuidv4() }, { new: true });
 }
 
+export function setTeamName(teamId: ObjectId, name: string) {
+  return Team.findByIdAndUpdate(teamId, { name }, { new: true });
+}
+
 export async function getTags(teamId: ObjectId) {
   const [dashboardTags, logViewTags] = await Promise.all([
     Dashboard.aggregate([

packages/api/src/routers/api/team.ts

@@ -6,7 +6,12 @@ import { z } from 'zod';
 import { validateRequest } from 'zod-express-middleware';
 
 import * as config from '@/config';
-import { getTags, getTeam, rotateTeamApiKey } from '@/controllers/team';
+import {
+  getTags,
+  getTeam,
+  rotateTeamApiKey,
+  setTeamName,
+} from '@/controllers/team';
 import {
   deleteTeamMember,
   findUserByEmail,
@@ -78,6 +83,28 @@ router.patch('/apiKey', async (req, res, next) => {
   }
 });
 
+router.patch(
+  '/name',
+  validateRequest({
+    body: z.object({
+      name: z.string().min(1).max(100),
+    }),
+  }),
+  async (req, res, next) => {
+    try {
+      const teamId = req.user?.team;
+      if (teamId == null) {
+        throw new Error(`User ${req.user?._id} not associated with a team`);
+      }
+      const { name } = req.body;
+      const team = await setTeamName(teamId, name);
+      res.json({ name: team?.name });
+    } catch (e) {
+      next(e);
+    }
+  },
+);
+
 router.post(
   '/invitation',
   validateRequest({

packages/api/src/routers/api/webhooks.ts

@@ -58,7 +58,7 @@ router.post(
       }
       const { name, service, url, description, queryParams, headers, body } =
         req.body;
-      if (await Webhook.findOne({ team: teamId, service, url })) {
+      if (await Webhook.findOne({ team: teamId, service, name })) {
         return res.status(400).json({
           message: 'Webhook already exists',
         });

packages/api/src/tasks/__tests__/checkAlerts.test.ts

@@ -99,6 +99,23 @@ describe('checkAlerts', () => {
     expect(expandToNestedObject({ 'foo.bar.baz': 'qux' })).toEqual({
       foo: { bar: { baz: 'qux' } },
     });
+    // inconsistent top level keys
+    expect(
+      expandToNestedObject({
+        foo: 'bar',
+        'foo.bar': 'baz',
+      }),
+    ).toEqual({
+      foo: 'bar',
+    });
+    expect(
+      expandToNestedObject({
+        'foo.bar': 'baz',
+        foo: 'bar',
+      }),
+    ).toEqual({
+      foo: 'bar',
+    });
     // mix
     expect(
       expandToNestedObject({

packages/api/src/tasks/checkAlerts.ts

@@ -126,11 +126,16 @@ export const expandToNestedObject = (
           break;
         }
         const nestedKey = keys[i];
-        if (i === keys.length - 1) {
-          nestedObj[nestedKey] = obj[key];
-        } else {
-          nestedObj[nestedKey] = nestedObj[nestedKey] || {};
-          nestedObj = nestedObj[nestedKey];
+        try {
+          if (i === keys.length - 1) {
+            nestedObj[nestedKey] = obj[key];
+          } else {
+            nestedObj[nestedKey] = nestedObj[nestedKey] || {};
+            nestedObj = nestedObj[nestedKey];
+          }
+        } catch (e) {
+          // skip the duplicate inconsistent top level keys case. ex: 'foo' and 'foo.bar'
+          logger.warn('expandToNestedObject', e);
         }
       }
     }

packages/app/.storybook/preview-head.html

@@ -1,13 +1,2 @@
-<link
-  rel="stylesheet"
-  href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css"
-/>
-<link
-  rel="preconnect"
-  href="https://fonts.gstatic.com"
-  crossorigin="anonymous"
-/>
-<link
-  href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@300;400;500;600;700&display=swap"
-  rel="stylesheet"
-/>
+<link rel="stylesheet" href="./styles/bootstrap-icons.css" />
+<link rel="stylesheet" href="./styles/google-fonts.css" />

packages/app/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @hyperdx/app
 
+## 1.10.1
+
 ## 1.10.0
 
 ### Minor Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperdx/app",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "private": true,
   "license": "MIT",
   "engines": {

packages/app/pages/_app.tsx

@@ -95,21 +95,9 @@ export default function MyApp({ Component, pageProps }: AppPropsWithLayout) {
   return (
     <React.Fragment>
       <Head>
-        <link
-          rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css"
-        />
+        <link rel="stylesheet" href="./styles/bootstrap-icons.css" />
         <link rel="icon" type="image/png" sizes="32x32" href="/Icon32.png" />
-        <link rel="preconnect" href="https://fonts.googleapis.com" />
-        <link
-          rel="preconnect"
-          href="https://fonts.gstatic.com"
-          crossOrigin="anonymous"
-        />
-        <link
-          href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@300;400;500;600;700&display=swap"
-          rel="stylesheet"
-        ></link>
+        <link rel="stylesheet" href="./styles/google-fonts.css" />
         <meta
           name="viewport"
           content="width=device-width, initial-scale=0.75"