Skip to content

Commit fd43e34

Browse files
jrauh01jrauh01
committed
Style fixes
1 parent 6f176ab commit fd43e34

9 files changed

+77
-38
lines changed

‎application/controllers/ChartsController.php

+21-5
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,24 @@ public function clusterAction(): void
7777
$this->addContent(
7878
new DoughnutChart(
7979
'chart-small',
80-
implode(', ', [$numberOfRunningPods, $numberOfPendingPods, $numberOfFailedPods, $numberOfSucceededPods]),
81-
implode(', ', [$numberOfRunningPods . ' Running', $numberOfPendingPods . ' Pending', $numberOfFailedPods . ' Failed', $numberOfSucceededPods . ' Succeeded']),
80+
implode(
81+
', ',
82+
[
83+
$numberOfRunningPods,
84+
$numberOfPendingPods,
85+
$numberOfFailedPods,
86+
$numberOfSucceededPods
87+
]
88+
),
89+
implode(
90+
', ',
91+
[
92+
$numberOfRunningPods . ' Running',
93+
$numberOfPendingPods . ' Pending',
94+
$numberOfFailedPods . ' Failed',
95+
$numberOfSucceededPods . ' Succeeded'
96+
]
97+
),
8298
'#007bff, #ffc107, #dc3545, #28a745'
8399
)
84100
);
@@ -127,7 +143,9 @@ public function nodeAction(): void
127143
$this->addContent(
128144
new LineChart(
129145
'chart-medium',
130-
implode(', ', $node['receivedBytes']) . '; ' . implode(', ', $node['transmittedBytes']),
146+
implode(', ', $node['receivedBytes'])
147+
. '; '
148+
. implode(', ', $node['transmittedBytes']),
131149
implode(', ', array_keys($node['receivedBytes'])),
132150
'Received Bytes; Transmitted Bytes',
133151
'#593684; #a3367f'
@@ -249,8 +267,6 @@ public function podAction(): void
249267

250268
$table->addHtml($tbody);
251269
$this->addContent($table);
252-
253-
254270
}
255271

256272
public function containerAction(): void

‎configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@
177177
]
178178
);
179179

180-
$this->provideJsFile('vendor/chart.umd.js');
180+
$this->provideJsFile('vendor/chart.umd.js');

‎library/Kubernetes/Common/Metrics.php

+45-24
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use ipl\Sql\Select;
66
use ipl\Sql\Connection;
77
use PDO;
8+
use DateTimeInterface;
89

910
class Metrics
1011
{
@@ -21,7 +22,11 @@ public function getClusterUsage(string $resource, int $period): array
2122
(new Select())
2223
->columns(['timestamp', 'value'])
2324
->from('prometheus_cluster_metric')
24-
->where('`group` = ? AND timestamp > UNIX_TIMESTAMP() * 1000 - ?', "$resource.usage", $period)
25+
->where(
26+
'`group` = ? AND timestamp > UNIX_TIMESTAMP() * 1000 - ?',
27+
"$resource.usage",
28+
$period
29+
)
2530
);
2631

2732
foreach ($dbData->fetchAll(PDO::FETCH_ASSOC) as $row) {
@@ -55,7 +60,11 @@ public function getClusterUsageCurrent(string $resource): float|null
5560
(new Select())
5661
->columns(['value'])
5762
->from('prometheus_cluster_metric')
58-
->where('`group` = ? AND timestamp > UNIX_TIMESTAMP() * 1000 - ?', "$resource.usage", 2 * 60 * 1000)
63+
->where(
64+
'`group` = ? AND timestamp > UNIX_TIMESTAMP() * 1000 - ?',
65+
"$resource.usage",
66+
2 * 60 * 1000
67+
)
5968
->orderBy('timestamp DESC')
6069
->limit(1)
6170
);
@@ -70,7 +79,11 @@ public function getNodeNetworkBytes(array &$nodeMetrics, string $direction, int
7079
->columns(['node.id', 'node.name', 'node_metric.timestamp', 'node_metric.value'])
7180
->from('prometheus_node_metric AS node_metric')
7281
->join('node', 'node_metric.node_id = node.id')
73-
->where('node_metric.group = ? AND node_metric.timestamp > UNIX_TIMESTAMP() * 1000 - ?', "network.$direction.bytes", $period)
82+
->where(
83+
'node_metric.group = ? AND node_metric.timestamp > UNIX_TIMESTAMP() * 1000 - ?',
84+
"network.$direction.bytes",
85+
$period
86+
)
7487
);
7588

7689
foreach ($dbData->fetchAll(PDO::FETCH_ASSOC) as $row) {
@@ -96,12 +109,13 @@ public function getPodRequest(array &$podMetrics, string $resource): void
96109
->join(
97110
[
98111
'latest_metrics' => (new Select())
99-
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
100-
->from('prometheus_pod_metric')
101-
->where('`group` = ?', "$resource.request")
102-
->groupBy('pod_id')
112+
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
113+
->from('prometheus_pod_metric')
114+
->where('`group` = ?', "$resource.request")
115+
->groupBy('pod_id')
103116
],
104-
'pod_metric.pod_id = latest_metrics.pod_id AND pod_metric.timestamp = latest_metrics.latest_timestamp'
117+
'pod_metric.pod_id = latest_metrics.pod_id'
118+
. ' AND pod_metric.timestamp = latest_metrics.latest_timestamp'
105119
)
106120
->where('pod_metric.group = ?', "$resource.request")
107121
);
@@ -123,12 +137,13 @@ public function getPodLimit(array &$podMetrics, string $resource): void
123137
->join(
124138
[
125139
'latest_metrics' => (new Select())
126-
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
127-
->from('prometheus_pod_metric')
128-
->where('`group` = ?', "$resource.limit")
129-
->groupBy('pod_id')
140+
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
141+
->from('prometheus_pod_metric')
142+
->where('`group` = ?', "$resource.limit")
143+
->groupBy('pod_id')
130144
],
131-
'pod_metric.pod_id = latest_metrics.pod_id AND pod_metric.timestamp = latest_metrics.latest_timestamp'
145+
'pod_metric.pod_id = latest_metrics.pod_id'
146+
. ' AND pod_metric.timestamp = latest_metrics.latest_timestamp'
132147
)
133148
->where('pod_metric.group = ?', "$resource.limit")
134149
);
@@ -150,12 +165,13 @@ public function getPodCpuCoreUsage(array &$podMetrics): void
150165
->join(
151166
[
152167
'latest_metrics' => (new Select())
153-
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
154-
->from('prometheus_pod_metric')
155-
->where('`group` = ?', 'cpu.usage.cores')
156-
->groupBy('pod_id')
168+
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
169+
->from('prometheus_pod_metric')
170+
->where('`group` = ?', 'cpu.usage.cores')
171+
->groupBy('pod_id')
157172
],
158-
'pod_metric.pod_id = latest_metrics.pod_id AND pod_metric.timestamp = latest_metrics.latest_timestamp'
173+
'pod_metric.pod_id = latest_metrics.pod_id'
174+
. ' AND pod_metric.timestamp = latest_metrics.latest_timestamp'
159175
)
160176
->where('pod_metric.group = ?', 'cpu.usage.cores')
161177
->where('timestamp > UNIX_TIMESTAMP() * 1000 - ?', 2 * 60 * 1000)
@@ -178,12 +194,13 @@ public function getPodMemoryByteUsage(array &$podMetrics): void
178194
->join(
179195
[
180196
'latest_metrics' => (new Select())
181-
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
182-
->from('prometheus_pod_metric')
183-
->where('`group` = ?', 'memory.usage.bytes')
184-
->groupBy('pod_id')
197+
->columns(['pod_id', 'MAX(timestamp) AS latest_timestamp'])
198+
->from('prometheus_pod_metric')
199+
->where('`group` = ?', 'memory.usage.bytes')
200+
->groupBy('pod_id')
185201
],
186-
'pod_metric.pod_id = latest_metrics.pod_id AND pod_metric.timestamp = latest_metrics.latest_timestamp'
202+
'pod_metric.pod_id = latest_metrics.pod_id'
203+
. ' AND pod_metric.timestamp = latest_metrics.latest_timestamp'
187204
)
188205
->where('pod_metric.group = ?', 'memory.usage.bytes')
189206
->where('timestamp > UNIX_TIMESTAMP() * 1000 - ?', 2 * 60 * 1000)
@@ -203,7 +220,11 @@ public function getPodUsage(array &$podMetrics, string $resource, int $period):
203220
->columns(['pod.id', 'pod.name', 'pod_metric.timestamp', 'pod_metric.value'])
204221
->from('prometheus_pod_metric AS pod_metric')
205222
->join('pod', 'pod_metric.pod_id = pod.id')
206-
->where('pod_metric.group = ? AND pod_metric.timestamp > UNIX_TIMESTAMP() * 1000 - ?', "$resource.usage", $period)
223+
->where(
224+
'pod_metric.group = ? AND pod_metric.timestamp > UNIX_TIMESTAMP() * 1000 - ?',
225+
"$resource.usage",
226+
$period
227+
)
207228
);
208229

209230
foreach ($dbData->fetchAll(PDO::FETCH_ASSOC) as $row) {

‎library/Kubernetes/Web/DoughnutChart.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ protected function assemble()
4343
)
4444
);
4545
}
46-
}
46+
}

‎library/Kubernetes/Web/DoughnutChartRequestLimit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ protected function assemble()
4343
)
4444
);
4545
}
46-
}
46+
}

‎library/Kubernetes/Web/DoughnutChartStates.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ protected function assemble()
4343
)
4444
);
4545
}
46-
}
46+
}

‎library/Kubernetes/Web/LineChart.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ protected function assemble()
4747
)
4848
);
4949
}
50-
}
50+
}

‎library/Kubernetes/Web/LineChartMinified.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ protected function assemble()
4343
)
4444
);
4545
}
46-
}
46+
}

‎library/Kubernetes/Web/NavigationList.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
use ipl\Html\Attributes;
88
use ipl\Html\Text;
99

10-
class NavigationList extends BaseHtmlElement {
10+
class NavigationList extends BaseHtmlElement
11+
{
1112
protected $tag = 'ul';
1213

1314
protected $defaultAttributes = ['class' => 'navigation-list'];
1415
protected $listItems = [];
1516

16-
public function __construct(array $listItems) {
17+
public function __construct(array $listItems)
18+
{
1719
$this->listItems = $listItems;
1820
}
1921

@@ -33,4 +35,4 @@ protected function assemble()
3335
);
3436
}
3537
}
36-
}
38+
}

0 commit comments

Comments
 (0)