From 98e58581e28ade0f305332494bc1ece0c91dd2f6 Mon Sep 17 00:00:00 2001 From: theshamuel Date: Fri, 5 May 2023 23:53:16 +0100 Subject: [PATCH 1/4] add health-check for db container I'd like to propose a minor changes that can bring more stability in launching the umami server with docker-compose by adding a certain healthcheck for db container and a certain condition for depends_on directive for umami-app container --- docker-compose.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bd63c68b..9b63c580 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,8 @@ services: DATABASE_TYPE: postgresql APP_SECRET: replace-me-with-a-random-string depends_on: - - db + db: + condition: service_healthy restart: always db: image: postgres:15-alpine @@ -22,5 +23,10 @@ services: - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro - umami-db-data:/var/lib/postgresql/data restart: always + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"] + interval: 5s + timeout: 5s + retries: 5 volumes: umami-db-data: From e773451679dc63f4361324d220c8aa10a3721f43 Mon Sep 17 00:00:00 2001 From: theshamuel Date: Fri, 5 May 2023 23:57:58 +0100 Subject: [PATCH 2/4] delete a redundant volume mapping I'd like to propose to delete from docker-compose a redundant volume mapping. As I see that `sql` directory had been deleted and now umami-app is responsible for migration. --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bd63c68b..33ae3708 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,6 @@ services: POSTGRES_USER: umami POSTGRES_PASSWORD: umami volumes: - - ./sql/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro - umami-db-data:/var/lib/postgresql/data restart: always volumes: From 97f4a3bccc490d4856cb1dd782355fe71a879d2e Mon Sep 17 00:00:00 2001 From: Ammar <61558359+ammar-madni@users.noreply.github.com> Date: Thu, 11 May 2023 17:27:37 +0100 Subject: [PATCH 3/4] Update index.js --- pages/realtime/[id]/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/realtime/[id]/index.js b/pages/realtime/[id]/index.js index 43475fa5..ba13ded3 100644 --- a/pages/realtime/[id]/index.js +++ b/pages/realtime/[id]/index.js @@ -10,7 +10,7 @@ export default function RealtimeDetailsPage() { const { formatMessage, labels } = useMessages(); const { get, useQuery } = useApi(); const { data: website } = useQuery(['websites', websiteId], () => - get(`/websites/${websiteId}`, { enabled: !!websiteId }), + websiteId ? get(`/websites/${websiteId}`, { enabled: !!websiteId }) : null, ); const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`; From c8ebb7695cb69da04380681216cf67757f364d0d Mon Sep 17 00:00:00 2001 From: AkashRajpurohit Date: Fri, 12 May 2023 22:38:12 +0530 Subject: [PATCH 4/4] fix: :adhesive_bandage: null value check for metric data --- components/metrics/MetricsTable.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js index 97deb39d..df2b8a69 100644 --- a/components/metrics/MetricsTable.js +++ b/components/metrics/MetricsTable.js @@ -59,7 +59,10 @@ export function MetricsTable({ const filteredData = useMemo(() => { if (data) { - let items = percentFilter(dataFilter ? dataFilter(data, filterOptions) : data); + const dataWithoutNullValues = data.filter(val => val.x !== null); + let items = percentFilter( + dataFilter ? dataFilter(dataWithoutNullValues, filterOptions) : dataWithoutNullValues, + ); if (limit) { items = items.filter((e, i) => i < limit); }