Add filters to Overview page: Filter by Broker, Time, and Topic #2105
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -524,7 +524,7 @@ private <M extends Metrics.Metric> void extractNodeMetrics( | |
| }); | ||
| } | ||
|
|
||
| public CompletionStage<Metrics> getNodeMetrics(String nodeId, int durationMinutes) { | ||
| if (kafkaContext.prometheus() == null) { | ||
| logger.warnf("Metrics requested for node %s, but Prometheus is not configured", nodeId); | ||
| return CompletableFuture.completedStage(new Metrics()); | ||
|
|
@@ -534,38 +534,39 @@ public CompletionStage<Metrics> getNodeMetrics(String nodeId) { | |
| String namespace = clusterConfig.getNamespace(); | ||
| String name = clusterConfig.getName(); | ||
|
|
||
| String rawRangeQuery; | ||
| String valueQuery; | ||
|
|
||
|
|
||
| try ( | ||
| var rangesStream = getClass().getResourceAsStream("/metrics/queries/kafkaCluster_ranges.promql"); | ||
| var valuesStream = getClass().getResourceAsStream("/metrics/queries/kafkaCluster_values.promql") | ||
| ) { | ||
| rawRangeQuery = new String(rangesStream.readAllBytes(), StandardCharsets.UTF_8) | ||
| .formatted(namespace, name); | ||
| valueQuery = new String(valuesStream.readAllBytes(), StandardCharsets.UTF_8) | ||
| .formatted(namespace, name); | ||
| } catch (IOException e) { | ||
| throw new UncheckedIOException(e); | ||
| } | ||
|
|
||
|
|
||
| String promInterval = "5m"; | ||
| if (durationMinutes >= 1440) promInterval = "30m"; | ||
| if (durationMinutes >= 10080) promInterval = "2h"; | ||
|
|
||
| final String finalizedQuery = rawRangeQuery.replace("[5m]", "[" + promInterval + "]"); | ||
|
Member
There was a problem hiding this comment. It may be better to use the placeholders in the promql templates and pass the interval to the |
||
|
|
||
| logger.debugf("Executing PromQL: %s", finalizedQuery); | ||
|
|
||
| Metrics nodeMetrics = new Metrics(); | ||
| var rangeFuture = metricsService.queryRanges(finalizedQuery, durationMinutes).toCompletableFuture(); | ||
| var valueFuture = metricsService.queryValues(valueQuery).toCompletableFuture(); | ||
|
|
||
| return CompletableFuture.allOf(rangeFuture, valueFuture) | ||
| .thenApply(nothing -> { | ||
| extractNodeMetrics(nodeId, rangeFuture.join(), nodeMetrics.ranges()); | ||
| extractNodeMetrics(nodeId, valueFuture.join(), nodeMetrics.values()); | ||
| return nodeMetrics; | ||
| }); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,15 +58,22 @@ export async function getKafkaCluster( | |
| clusterId: string, | ||
| params?: { | ||
| fields?: string; | ||
| duration?: number; // Optional duration | ||
| }, | ||
| ): Promise<ApiResponse<ClusterDetail>> { | ||
| const queryParams = new URLSearchParams({ | ||
| "fields[kafkas]": | ||
| params?.fields ?? | ||
| "name,namespace,creationTimestamp,status,kafkaVersion,nodes,listeners,metrics,conditions,nodePools,cruiseControlEnabled", | ||
| }); | ||
|
|
||
| if (params?.duration) { | ||
| queryParams.append("duration", params.duration.toString()); | ||
|
Member
There was a problem hiding this comment. To be explicit about what the duration is for and to match the other params, what do you think about calling it |
||
| } | ||
|
|
||
| return fetchData( | ||
| `/api/kafkas/${clusterId}`, | ||
| queryParams, | ||
| (rawData: any) => ClusterResponse.parse(rawData).data, | ||
| undefined, | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,8 @@ import { | |
| NodeRoles, | ||
| BrokerStatus, | ||
| ControllerStatus, | ||
| NodeMetricsResponseSchema, | ||
| NodeMetrics, | ||
| } from "@/api/nodes/schema"; | ||
| import { filterUndefinedFromObj } from "@/utils/filterUndefinedFromObj"; | ||
|
|
||
|
|
@@ -67,3 +69,15 @@ export async function getNodeConfiguration( | |
| (rawData) => ConfigResponseSchema.parse(rawData).data, | ||
| ); | ||
| } | ||
|
|
||
| export async function getNodeMetrics( | ||
| kafkaId: string, | ||
| nodeId: number | string, | ||
| duration: number, | ||
| ): Promise<ApiResponse<NodeMetrics>> { | ||
| return fetchData( | ||
| `/api/kafkas/${kafkaId}/nodes/${nodeId}/metrics?duration=${duration}`, | ||
| "", | ||
| (rawData) => NodeMetricsResponseSchema.parse(rawData), | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,10 +19,13 @@ const ControllerStatusSchema = z.union([ | |
| z.literal("Unknown"), | ||
| ]); | ||
|
|
||
| const NodePoolsSchema = z.record( | ||
| z.string(), | ||
| z.object({ | ||
| roles: z.array(z.string()), | ||
| count: z.number(), | ||
| }), | ||
| ); | ||
|
|
||
| export const NodeSchema = z.object({ | ||
| id: z.string(), | ||
|
|
@@ -116,6 +119,35 @@ const ConfigSchema = z.object({ | |
| ), | ||
| }); | ||
|
|
||
| export const MetricsSchema = z.object({ | ||
| values: z.record( | ||
| z.string(), | ||
| z.array( | ||
| z.object({ | ||
| value: z.string(), | ||
| nodeId: z.string(), | ||
| }), | ||
| ), | ||
| ), | ||
| ranges: z.record( | ||
| z.string(), | ||
| z.array( | ||
| z.object({ | ||
| range: z.array(z.tuple([z.string(), z.string()])), | ||
| nodeId: z.string().optional(), | ||
| }), | ||
| ), | ||
| ), | ||
| }); | ||
|
|
||
| export const NodeMetricsResponseSchema = z.object({ | ||
| data: z.object({ | ||
| attributes: z.object({ | ||
| metrics: MetricsSchema.optional().nullable(), | ||
| }), | ||
| }), | ||
| }); | ||
|
|
||
| export type NodeConfig = z.infer<typeof ConfigSchema>; | ||
|
|
||
| export type BrokerStatus = z.infer<typeof BrokerStatusSchema>; | ||
|
|
@@ -129,3 +161,5 @@ export type Statuses = z.infer<typeof StatusesSchema>; | |
| export const ConfigResponseSchema = z.object({ | ||
| data: ConfigSchema, | ||
| }); | ||
|
|
||
| export type NodeMetrics = z.infer<typeof NodeMetricsResponseSchema>; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,8 @@ import { | |
| Topic, | ||
| TopicCreateResponse, | ||
| TopicCreateResponseSchema, | ||
| TopicMetrics, | ||
| TopicMetricsResponseSchema, | ||
| TopicResponse, | ||
| TopicsResponse, | ||
| TopicsResponseSchema, | ||
|
|
@@ -206,3 +208,14 @@ export async function setTopicAsViewed(kafkaId: string, topicId: string) { | |
| return viewedTopics; | ||
| } | ||
| } | ||
|
|
||
| export async function gettopicMetrics( | ||
| kafkaId: string, | ||
| topicId: number | string, | ||
| ): Promise<ApiResponse<TopicMetrics>> { | ||
| return fetchData( | ||
| `/api/kafkas/${kafkaId}/topics/${topicId}/metrics`, | ||
| "", | ||
| (rawData) => TopicMetricsResponseSchema.parse(rawData), | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe better to add the
@DefaultValueand make the arg anint, then the null checking can be removed elsewhere.