Skip to content

Commit cca0d19

Browse files
author
Thomas Delbende
committed
Remove all references to metrics_format
1 parent 149b922 commit cca0d19

File tree

6 files changed

+7
-58
lines changed

6 files changed

+7
-58
lines changed

‎bleemeo/internal/synchronizer/facts.go

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func getEssentialFacts() map[string]bool {
4040
"os_pretty_name": true,
4141
"public_ip": true,
4242
"virtual": true,
43-
"metrics_format": true,
4443
}
4544
}
4645

‎bleemeo/internal/synchronizer/sync_test.go

-21
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
13031303
"hostname": "ubuntu2210",
13041304
"installation_format": "Package (deb)",
13051305
"kernel": "Linux",
1306-
"metrics_format": "Bleemeo",
13071306
"os_name": "Ubuntu",
13081307
"os_pretty_name": "Ubuntu 22.10",
13091308
"public_ip": "12.23.45.67",
@@ -1317,7 +1316,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
13171316
"hostname": "ubuntu2210",
13181317
"installation_format": "Package (deb)",
13191318
"kernel": "Linux",
1320-
"metrics_format": "Bleemeo",
13211319
"os_name": "Ubuntu",
13221320
"os_pretty_name": "Ubuntu 22.10",
13231321
"public_ip": "12.23.45.67",
@@ -1347,7 +1345,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
13471345
"kernel_release": "5.15.49-linuxkit",
13481346
"kernel_version": "5.15.49",
13491347
"memory": "15.61 GB",
1350-
"metrics_format": "Bleemeo",
13511348
"os_codename": "kinetic",
13521349
"os_family": "debian",
13531350
"os_name": "Ubuntu",
@@ -1377,7 +1374,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
13771374
"kernel_release": "5.15.49-linuxkit",
13781375
"kernel_version": "5.15.49",
13791376
"memory": "15.61 GB",
1380-
"metrics_format": "Bleemeo",
13811377
"os_codename": "kinetic",
13821378
"os_family": "debian",
13831379
"os_name": "Ubuntu",
@@ -1417,7 +1413,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
14171413
"kernel_release": "5.15.49-linuxkit",
14181414
"kernel_version": "5.15.49",
14191415
"memory": "15.61 GB",
1420-
"metrics_format": "Bleemeo",
14211416
"os_codename": "jammy",
14221417
"os_family": "debian",
14231418
"os_name": "Ubuntu",
@@ -1447,7 +1442,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
14471442
"kernel_release": "5.15.49-linuxkit",
14481443
"kernel_version": "5.15.49",
14491444
"memory": "15.61 GB",
1450-
"metrics_format": "Bleemeo",
14511445
"os_codename": "jammy",
14521446
"os_family": "debian",
14531447
"os_name": "Ubuntu",
@@ -1487,7 +1481,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
14871481
"kernel_release": "5.15.49-linuxkit",
14881482
"kernel_version": "5.15.49",
14891483
"memory": "15.61 GB",
1490-
"metrics_format": "Bleemeo",
14911484
"os_codename": "jammy",
14921485
"os_family": "debian",
14931486
"os_name": "Ubuntu",
@@ -1528,7 +1521,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
15281521
"kernel_release": "5.15.49-linuxkit",
15291522
"kernel_version": "5.15.49",
15301523
"memory": "15.61 GB",
1531-
"metrics_format": "Bleemeo",
15321524
"os_codename": "jammy",
15331525
"os_family": "debian",
15341526
"os_name": "Ubuntu",
@@ -1558,7 +1550,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
15581550
"kernel_release": "5.15.49-linuxkit",
15591551
"kernel_version": "5.15.49",
15601552
"memory": "15.61 GB",
1561-
"metrics_format": "Bleemeo",
15621553
"os_codename": "jammy",
15631554
"os_family": "debian",
15641555
"os_name": "Ubuntu",
@@ -1597,7 +1588,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
15971588
"kernel_release": "5.15.49-linuxkit",
15981589
"kernel_version": "5.15.49",
15991590
"memory": "15.61 GB",
1600-
"metrics_format": "Bleemeo",
16011591
"os_codename": "jammy",
16021592
"os_family": "debian",
16031593
"os_name": "Ubuntu",
@@ -1627,7 +1617,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
16271617
"kernel_release": "5.15.49-linuxkit",
16281618
"kernel_version": "5.15.49",
16291619
"memory": "15.61 GB",
1630-
"metrics_format": "Bleemeo",
16311620
"os_codename": "jammy",
16321621
"os_family": "debian",
16331622
"os_name": "Ubuntu",
@@ -1666,7 +1655,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
16661655
"kernel_release": "5.15.49-linuxkit",
16671656
"kernel_version": "5.15.49",
16681657
"memory": "15.61 GB",
1669-
"metrics_format": "Bleemeo",
16701658
"os_codename": "jammy",
16711659
"os_family": "debian",
16721660
"os_name": "Ubuntu",
@@ -1696,7 +1684,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
16961684
"kernel_release": "5.15.49-linuxkit",
16971685
"kernel_version": "5.15.49",
16981686
"memory": "15.61 GB",
1699-
"metrics_format": "Bleemeo",
17001687
"os_codename": "kinetic",
17011688
"os_family": "debian",
17021689
"os_name": "Ubuntu",
@@ -1736,7 +1723,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
17361723
"kernel_release": "5.15.49-linuxkit",
17371724
"kernel_version": "5.15.49",
17381725
"memory": "15.61 GB",
1739-
"metrics_format": "Bleemeo",
17401726
"os_codename": "jammy",
17411727
"os_family": "debian",
17421728
"os_name": "Ubuntu",
@@ -1766,7 +1752,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
17661752
"kernel_release": "5.15.49-linuxkit",
17671753
"kernel_version": "5.15.49",
17681754
"memory": "15.61 GB",
1769-
"metrics_format": "Bleemeo",
17701755
"os_codename": "jammy",
17711756
"os_family": "debian",
17721757
"os_name": "Ubuntu",
@@ -1806,7 +1791,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
18061791
"kernel_release": "5.15.49-linuxkit",
18071792
"kernel_version": "5.15.49",
18081793
"memory": "15.61 GB",
1809-
"metrics_format": "Bleemeo",
18101794
"os_codename": "jammy",
18111795
"os_family": "debian",
18121796
"os_name": "Ubuntu",
@@ -1835,7 +1819,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
18351819
"kernel_release": "5.15.49-linuxkit",
18361820
"kernel_version": "5.15.49",
18371821
"memory": "15.61 GB",
1838-
"metrics_format": "Bleemeo",
18391822
"os_codename": "kinetic",
18401823
"os_family": "debian",
18411824
"os_name": "Ubuntu",
@@ -1876,7 +1859,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
18761859
"kernel_release": "5.15.49-linuxkit",
18771860
"kernel_version": "5.15.49",
18781861
"memory": "15.61 GB",
1879-
"metrics_format": "Bleemeo",
18801862
"os_codename": "kinetic",
18811863
"os_family": "debian",
18821864
"os_name": "Ubuntu",
@@ -1906,7 +1888,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
19061888
"kernel_release": "5.15.49-linuxkit",
19071889
"kernel_version": "5.15.49",
19081890
"memory": "15.61 GB",
1909-
"metrics_format": "Bleemeo",
19101891
"os_codename": "jammy",
19111892
"os_family": "debian",
19121893
"os_name": "Ubuntu",
@@ -1946,7 +1927,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
19461927
"kernel_release": "5.15.49-linuxkit",
19471928
"kernel_version": "5.15.49",
19481929
"memory": "15.61 GB",
1949-
"metrics_format": "Bleemeo",
19501930
"os_codename": "jammy",
19511931
"os_family": "debian",
19521932
"os_name": "Ubuntu",
@@ -1976,7 +1956,6 @@ func Test_isDuplicatedUsingFacts(t *testing.T) { //nolint:maintidx
19761956
"kernel_release": "5.15.49-linuxkit",
19771957
"kernel_version": "5.15.49",
19781958
"memory": "15.61 GB",
1979-
"metrics_format": "Bleemeo",
19801959
"os_codename": "kinetic",
19811960
"os_family": "debian",
19821961
"os_name": "Ubuntu",

‎examples/mqtt/glouton.conf

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
agent:
2-
metrics_format: prometheus
3-
41
bleemeo:
52
enable: false
63

74
mqtt:
85
enable: true
9-
hosts:
6+
hosts:
107
- 127.0.0.1
118
port: 1883
129

‎facts/facts.md

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ kubelet_version
5656
kubernetes_cluster_name
5757
kubernetes_version
5858
memory
59-
metrics_format
6059
os_codename
6160
os_family
6261
os_name

‎webui/src/components/Agent/AgentSystemDashboard.tsx

+5-30
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,15 @@ import WidgetDashboardItem from "../UI/WidgetDashboardItem";
44
import MetricGaugeItem from "../Metric/MetricGaugeItem";
55

66
import {
7-
GaugeBar,
87
gaugesBarBLEEMEO,
9-
gaugesBarPrometheusLinux,
10-
gaugesBarPrometheusWindows,
11-
NumberMetric,
128
numberMetricsBLEEMEO,
139
} from "../Metric/DefaultDashboardMetrics";
1410
import { chartTypes, useIntersection } from "../utils";
15-
import { Fact } from "../Data/data.interface";
1611
import { Box, Container, Flex, Grid, SimpleGrid } from "@chakra-ui/react";
1712
import { ServicesList } from "../UI/ServicesList";
1813
import { LastLogsList } from "../UI/LastLogsList";
1914

20-
type AgentSystemDashboardProps = {
21-
facts: Fact[];
22-
};
23-
24-
const AgentSystemDashboard: FC<AgentSystemDashboardProps> = ({ facts }) => {
25-
let gaugesBar: GaugeBar[] = [];
26-
let numberMetrics: NumberMetric[] = [];
27-
28-
if (facts.find((f) => f.name === "metrics_format")?.value === "Bleemeo") {
29-
gaugesBar = gaugesBarBLEEMEO;
30-
numberMetrics = numberMetricsBLEEMEO;
31-
} else if (
32-
facts.find((f) => f.name === "metrics_format")?.value == "Prometheus"
33-
) {
34-
if (facts.find((f) => f.name === "kernel")?.value == "Linux") {
35-
gaugesBar = gaugesBarPrometheusLinux;
36-
} else {
37-
gaugesBar = gaugesBarPrometheusWindows;
38-
}
39-
}
40-
15+
const AgentSystemDashboard: FC = () => {
4116
const triggerRef = useRef<HTMLDivElement>(null);
4217
const isVisible = useIntersection(triggerRef, "0px");
4318
const otherMetricsWidgetMaxHeight = "40vh";
@@ -50,8 +25,8 @@ const AgentSystemDashboard: FC<AgentSystemDashboardProps> = ({ facts }) => {
5025
<>
5126
<Container h="100%">
5227
<Flex direction="column" h="100%">
53-
<SimpleGrid columns={gaugesBar.length} spacing={5}>
54-
{gaugesBar.map((gaugeItem) => (
28+
<SimpleGrid columns={gaugesBarBLEEMEO.length} spacing={5}>
29+
{gaugesBarBLEEMEO.map((gaugeItem) => (
5530
<Box ref={triggerRef} key={gaugeItem.title}>
5631
{isVisible ? (
5732
<WidgetDashboardItem
@@ -68,8 +43,8 @@ const AgentSystemDashboard: FC<AgentSystemDashboardProps> = ({ facts }) => {
6843
))}
6944
</SimpleGrid>
7045

71-
<SimpleGrid columns={numberMetrics.length} spacing={5} mt={5}>
72-
{numberMetrics.map((numberMetric) => (
46+
<SimpleGrid columns={numberMetricsBLEEMEO.length} spacing={5} mt={5}>
47+
{numberMetricsBLEEMEO.map((numberMetric) => (
7348
<Box ref={triggerRef} key={numberMetric.title}>
7449
{isVisible ? (
7550
numberMetric.metrics?.length > 1 ? (

‎webui/src/components/Routes.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const MyRoutes = () => {
5050
<Routes>
5151
<Route
5252
path="/dashboard"
53-
element={<AgentSystemDashboard facts={facts} />}
53+
element={<AgentSystemDashboard />}
5454
/>
5555
<Route
5656
path="/docker"

0 commit comments

Comments
 (0)