From 445e73309a4eac0ec03dca951ec78642c4c419e2 Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Wed, 18 Sep 2024 21:08:13 -0700 Subject: [PATCH 1/3] Limit Grafana CPU usage --- deployments/apps/grafana.deploy.yml | 1 + .../PlanktoScope/device-pkgs/forklift-version-lock.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployments/apps/grafana.deploy.yml b/deployments/apps/grafana.deploy.yml index 32c2e3f..d0e856f 100644 --- a/deployments/apps/grafana.deploy.yml +++ b/deployments/apps/grafana.deploy.yml @@ -4,4 +4,5 @@ features: - no-login - prometheus-datasource - host-summary-dashboard + - cpu-limit disabled: false diff --git a/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml b/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml index 3b11c36..8eca2ee 100644 --- a/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml +++ b/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml @@ -1,4 +1,4 @@ type: pseudoversion tag: v2024.0.0-beta.1 -timestamp: "20240916054717" -commit: d643364044e2956fe149b78ae66889e506a32a63 +timestamp: "20240919040253" +commit: 942c988400cbab4006e0c24b8c2c88dc9335fe3a From e8f45af9c4f71770f22a47639ed40b7110f4507f Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Wed, 18 Sep 2024 21:36:33 -0700 Subject: [PATCH 2/3] Bump device-pkgs repo --- .../PlanktoScope/device-pkgs/forklift-version-lock.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml b/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml index 8eca2ee..a4d3926 100644 --- a/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml +++ b/requirements/repositories/github.com/PlanktoScope/device-pkgs/forklift-version-lock.yml @@ -1,4 +1,4 @@ type: pseudoversion tag: v2024.0.0-beta.1 -timestamp: "20240919040253" -commit: 942c988400cbab4006e0c24b8c2c88dc9335fe3a +timestamp: "20240919043412" +commit: 8cb335e5b5696eca7ba36c621ec6a206f5c23219 From 1281b4dc662461952a8bf0f674fc70c5f6b3d68c Mon Sep 17 00:00:00 2001 From: Ethan Li Date: Wed, 18 Sep 2024 21:37:49 -0700 Subject: [PATCH 3/3] Update `CHANGELOG.md` --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8913900..432afd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ All dates in this file are given in the [UTC time zone](https://en.wikipedia.org - Added a `host/prepare-custom-image` package to export a script to `/usr/libexec/prepare-custom-image` for resetting the filesystem and shutting down the machine in preparation for cloning the filesystem as an SD card image. - Added experimental feature flags for other pallets to reference when importing files from this pallet. +### Changed + +- Deployment `apps/grafana` now tries to limit Grafana's CPU usage to one core. + ## v2024.0.0-beta.1 - 2024-06-24 ### Changed