Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/actions #1712

Merged
merged 16 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 39 additions & 32 deletions hermes-console-vue/json-server/db.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@
"pl.allegro.public.offer.OfferEventV3",
"pl.allegro.public.order.OrderEventV1",
"pl.allegro.public.order.OrderEventV2",
"pl.allegro.public.user.UserCreatedEvent",
"pl.allegro.public.user.UserChangedEvent",
"pl.allegro.public.group.DummyEvent",
"pl.allegro.public.admin.AdminOfferActionEvent",
"pl.allegro.public.admin.AdminOrderActionEvent"
Expand All @@ -119,11 +117,11 @@
],
"readinessDatacenters": [
{
"datacenter": "DC1",
"datacenter": "DC1",
"isReady": true
},
{
"datacenter": "DC2",
"datacenter": "DC2",
"isReady": false
}
],
Expand All @@ -136,8 +134,7 @@
"consumersNumber": 4
}
},
"subscriptionConstraints":
{
"subscriptionConstraints": {
"pl.group.Topic$subscription": {
"consumersNumber": 6
},
Expand Down Expand Up @@ -327,7 +324,7 @@
"requestTimeout": 1000,
"socketTimeout": 0,
"sendingDelay": 0,
"backoffMultiplier": 1.0,
"backoffMultiplier": 1,
"backoffMaxIntervalInSec": 600,
"retryClientErrors": true,
"backoffMaxIntervalMillis": 600000
Expand All @@ -336,7 +333,7 @@
"trackingMode": "trackingOff",
"owner": {
"source": "Service Catalog",
"id": "42"
"id": "41"
},
"monitoringDetails": {
"severity": "NON_IMPORTANT",
Expand Down Expand Up @@ -401,7 +398,7 @@
"trackingMode": "trackingOff",
"owner": {
"source": "Service Catalog",
"id": "42"
"id": "41"
},
"monitoringDetails": {
"severity": "NON_IMPORTANT",
Expand Down Expand Up @@ -564,10 +561,12 @@
}
},
"owner": {
"sources": [{
"name": "Crowd",
"placeholder": "Crowd group (or groups separated by ',')"
}]
"sources": [
{
"name": "Crowd",
"placeholder": "Crowd group (or groups separated by ',')"
}
]
},
"topic": {
"messagePreviewEnabled": true,
Expand All @@ -592,19 +591,24 @@
"removeSchema": false,
"schemaIdAwareSerializationEnabled": false,
"avroContentTypeMetadataRequired": true,
"contentTypes": [{
"value": "AVRO",
"label": "AVRO"
}, {
"value": "JSON",
"label": "JSON"
}],
"contentTypes": [
{
"value": "AVRO",
"label": "AVRO"
},
{
"value": "JSON",
"label": "JSON"
}
],
"readOnlyModeEnabled": false,
"allowedTopicLabels": [],
"retentionUnits": [{
"value": "DAYS",
"label": "DAYS"
}],
"retentionUnits": [
{
"value": "DAYS",
"label": "DAYS"
}
],
"offlineRetransmissionEnabled": false,
"offlineRetransmissionDescription": "Offline retransmission"
},
Expand All @@ -626,13 +630,16 @@
},
"deliveryType": "SERIAL"
},
"deliveryTypes": [{
"value": "SERIAL",
"label": "SERIAL"
}, {
"value": "BATCH",
"label": "BATCH"
}]
"deliveryTypes": [
{
"value": "SERIAL",
"label": "SERIAL"
},
{
"value": "BATCH",
"label": "BATCH"
}
]
},
"consistency": {
"maxGroupBatchSize": 10
Expand All @@ -654,4 +661,4 @@
"avroSubscriptionCount": 100
}
}
}
}
24 changes: 24 additions & 0 deletions hermes-console-vue/json-server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,30 @@ server.post('/topics/*/subscriptions/*/moveOffsetsToTheEnd', (req, res) => {
res.sendStatus(200);
});

server.delete('/groups/:group', (req, res) => {
res.sendStatus(200);
});

server.delete('/topics/:topic', (req, res) => {
res.sendStatus(200);
});

server.delete('/subscriptions/:subscription', (req, res) => {
res.sendStatus(200);
});

server.put('/topics/*/subscriptions/*/state', (req, res) => {
res.sendStatus(200);
});

server.delete('/consistency/inconsistencies/topics', (req, res) => {
res.sendStatus(200);
});

server.post('/readiness/datacenters/:dc', (req, res) => {
res.sendStatus(200);
});

const router = jsonServer.router('json-server/db.json');
server.use(router);

Expand Down
116 changes: 113 additions & 3 deletions hermes-console-vue/src/api/hermes-client/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axios from 'axios';
import { State } from '@/api/subscription';
import axios from '@/utils/axios/axios-instance';
import qs from 'query-string';
import type { AccessTokenResponse } from '@/api/access-token-response';
import type { AppConfiguration } from '@/api/app-configuration';
Expand All @@ -15,18 +16,21 @@ import type {
} from '@/api/topic';
import type { OfflineClientsSource } from '@/api/offline-clients-source';
import type { Owner } from '@/api/owner';
import type { ResponsePromise } from '@/utils/axios-utils';
import type { ResponsePromise } from '@/utils/axios/axios-utils';
import type { Role } from '@/api/role';
import type { SentMessageTrace } from '@/api/subscription-undelivered';
import type { Stats } from '@/api/stats';
import type { Subscription } from '@/api/subscription';
import type { SubscriptionHealth } from '@/api/subscription-health';
import type { SubscriptionMetrics } from '@/api/subscription-metrics';

export function fetchTopic(
topicName: string,
): ResponsePromise<TopicWithSchema> {
return axios.get<TopicWithSchema>(`/topics/${topicName}`);
}

export function fetchTopicOwner(ownerId: string): ResponsePromise<Owner> {
export function fetchOwner(ownerId: string): ResponsePromise<Owner> {
return axios.get<Owner>(`/owners/sources/Service Catalog/${ownerId}`);
}

Expand Down Expand Up @@ -57,6 +61,71 @@ export function fetchTopicSubscriptionDetails(
);
}

export function fetchSubscription(
topicName: string,
subscriptionName: string,
): ResponsePromise<Subscription> {
return axios.get<Subscription>(
`/topics/${topicName}/subscriptions/${subscriptionName}`,
);
}

export function suspendSubscription(
topicName: string,
subscriptionName: string,
): ResponsePromise<void> {
return axios.put(
`/topics/${topicName}/subscriptions/${subscriptionName}/state`,
State.SUSPENDED,
);
}

export function activateSubscription(
topicName: string,
subscriptionName: string,
): ResponsePromise<void> {
return axios.put(
`/topics/${topicName}/subscriptions/${subscriptionName}/state`,
State.ACTIVE,
);
}

export function fetchSubscriptionMetrics(
topicName: string,
subscriptionName: string,
): ResponsePromise<SubscriptionMetrics> {
return axios.get<SubscriptionMetrics>(
`/topics/${topicName}/subscriptions/${subscriptionName}/metrics`,
);
}

export function fetchSubscriptionHealth(
topicName: string,
subscriptionName: string,
): ResponsePromise<SubscriptionHealth> {
return axios.get<SubscriptionHealth>(
`/topics/${topicName}/subscriptions/${subscriptionName}/health`,
);
}

export function fetchSubscriptionUndeliveredMessages(
topicName: string,
subscriptionName: string,
): ResponsePromise<SentMessageTrace[]> {
return axios.get<SentMessageTrace[]>(
`/topics/${topicName}/subscriptions/${subscriptionName}/undelivered`,
);
}

export function fetchSubscriptionLastUndeliveredMessage(
topicName: string,
subscriptionName: string,
): ResponsePromise<SentMessageTrace> {
return axios.get<SentMessageTrace>(
`/topics/${topicName}/subscriptions/${subscriptionName}/undelivered/last`,
);
}

export function fetchAppConfiguration(): ResponsePromise<AppConfiguration> {
return axios.get<AppConfiguration>('/console', {
headers: { accept: 'application/json' },
Expand Down Expand Up @@ -168,3 +237,44 @@ export function moveSubscriptionOffsets(
`/topics/${topicName}/subscriptions/${subscription}/moveOffsetsToTheEnd`,
);
}

export function removeTopic(topic: String): ResponsePromise<void> {
return axios.delete(`/topics/${topic}`);
}

export function removeSubscription(
topic: String,
subscription: String,
): ResponsePromise<void> {
return axios.delete(`/topics/${topic}/subscriptions/${subscription}`);
}

export function removeGroup(group: String): ResponsePromise<void> {
return axios.delete(`/groups/${group}`);
}

export function removeInconsistentTopic(topic: string): ResponsePromise<void> {
return axios.delete('/consistency/inconsistencies/topics', {
params: {
topicName: topic,
},
paramsSerializer: {
indexes: null,
},
});
}

export function switchReadiness(
datacenter: string,
desiredState: boolean,
): ResponsePromise<void> {
return axios.post(
`/readiness/datacenters/${datacenter}`,
qs.stringify({
isReady: desiredState,
}),
{
'Content-Type': 'application/json',
} as AxiosRequestConfig,
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
const props = defineProps<{
notification: Notification;
}>();
defineEmits(['close']);
const emit = defineEmits<{
close: [];
}>();
</script>

<template>
Expand All @@ -15,7 +17,7 @@
border="start"
elevation="3"
width="500"
@click:close="$emit('close')"
@click:close="emit('close')"
/>
</template>
<style scoped lang="scss"></style>
Loading