Skip to content

控制台增加监控配置 #18

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.

Sign up for GitHub

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

Open
zks888 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

控制台增加监控配置 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions carrera-console/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@ BASEDIR=$(dirname "$0")
cd ${BASEDIR}
WKDIR=`pwd`

# cd ${BASEDIR}/carrera-console-fe
# sh build.sh
# cd ..
# rm -rf carrera-console/src/main/webapp/build carrera-console/src/main/webapp/static carrera-console/src/main/webapp/index.html
# cp -R carrera-console-fe/dist/* carrera-console/src/main/webapp


cd ${BASEDIR}/carrera-console

mvn clean package -Pdev -Dmaven.test.skip=true

cd ..
OUTPATH=${WKDIR}/output
mkdir -p ${OUTPATH}
rm -rf ${OUTPATH}/carrera.war
cp control.sh ${OUTPATH}/
cp carrera-console/target/carrera.war ${OUTPATH}/
41 changes: 30 additions & 11 deletions carrera-console/carrera-console-fe/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions carrera-console/carrera-console-fe/src/mixins/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,22 @@ export default {
}
},

formatUrlObject (keys) {
let arrays = [];
if (keys && keys.length) {
keys.forEach((item) => {
arrays.push({
key: item
});
});
} else {
arrays = [{
key: ''
}];
}
return arrays;
},

// 根据value获取label
getNameById (id, array) {
let label = '';
Expand Down
14 changes: 10 additions & 4 deletions carrera-console/carrera-console-fe/src/pages/group/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@click="getGroupList"></bc-button>
<bc-button icon="plus"
type="primary"
@click="handleCreateGroup">Consumer Group
@click="handleCreateGroup">Add
</bc-button>
<bc-button-group>
<bc-button type="gray"
Expand Down Expand Up @@ -50,18 +50,24 @@
@on-check-all="handleCheckTableAll"
empty-text="No data"
ref="table">
<bc-table-column field="groupName" index="groupName" label="Consumer Group">
<bc-table-column field="groupName" index="groupName" label="Group Name">
</bc-table-column>
<bc-table-column field="subscriptionNum" index="subscriptionNum" label="Subscription Number">
</bc-table-column>
<bc-table-column field="subscriptionEnableNum" index="subscriptionEnableNum" label="Enabled Subscription Number">
</bc-table-column>

<bc-table-column field="remark" index="remark" label="Remark">
<template slot-scope="scope">
{{scope.record.remark}}
</template>
</bc-table-column>

<bc-table-column field="operate" index="operate" label="Operation" width="430px">
<template slot-scope="scope">
<router-link class="text-link" :to="{ name: 'subscribes', query: { groupId: scope.record.groupId} }">Subscriptions</router-link>
<a :class="['text-link', scope.record.subscriptionNum ? '':'disable-text-link']" href="" @click.prevent="handleConsume(scope.record)">Consume Progress</a>
<a :class="['text-link']" @click="handleEditGroup(scope.record)">Edit Consumer Group</a>
<a :class="['text-link', scope.record.subscriptionNum ? '':'disable-text-link']" href="" @click.prevent="handleConsume(scope.record)">Progress</a>
<a :class="['text-link']" @click="handleEditGroup(scope.record)">Edit</a>
</template>
</bc-table-column>
</bc-table>
Expand Down
45 changes: 38 additions & 7 deletions carrera-console/carrera-console-fe/src/pages/group/modals/create.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
:rules="formRule"
labelAlign="top">

<bc-form-item label="Consumer Group：" prop="groupName">
<bc-form-item label="Consumer Group Name：" prop="groupName">
<bc-input v-model="form.groupName"
:disabled='isEditing'
placeholder="Please input Consumer Group">
placeholder="Please input Consumer Group Name">
<span slot="prepend">cg_</span>
</bc-input>
</bc-form-item>
Expand All @@ -31,6 +31,31 @@
<div>2. Once created can't modify the Consumer Group name</div>
</div>

<bc-form-item label="Remark：" prop="remark">
<bc-input v-model="form.remark" placeholder="Please input Remark">
</bc-input>
</bc-form-item>

<bc-form-item label="Alarm Group：" prop="alarmGroup">
<bc-input v-model="form.alarmGroup" placeholder="Please input Alarm Group">
</bc-input>
</bc-form-item>

<bc-form-item label="Alarm Level：" prop="alarmLevel">
<bc-input v-model="form.alarmLevel" placeholder="Please input Alarm Level">
</bc-input>
</bc-form-item>

<bc-form-item label="Alarm Msg Lag：" prop="alarmMsgLag">
<bc-input v-model="form.alarmMsgLag" placeholder="Please input Alarm Msg Lag">
</bc-input>
</bc-form-item>

<bc-form-item label="Alarm Delay Time：" prop="alarmDelayTime">
<bc-input v-model="form.alarmDelayTime" placeholder="Please input Alarm Delay Time">
</bc-input>
</bc-form-item>

<bc-form-item label="Additional Parameters">
<div class="conf-margin" v-for="(item,i) in others" :key="i">
<bc-input v-model="item.key" placeholder="key" style="width:240px;margin-right: 10px;"></bc-input>
Expand Down Expand Up @@ -84,7 +109,12 @@
others: [{ key: '', value: '' }],
form: {
groupId: '',
groupName: ''
groupName: '',
remark: '',
alarmGroup: null,
alarmLevel: 1,
alarmMsgLag: 10000,
alarmDelayTime: 300000
},
formRule: createGroup,

Expand Down Expand Up @@ -157,11 +187,12 @@
service: 'Engineering',
department: 'Software',
contacters: 'administration;',
alarmGroup: null,
alarmLevel: 1,
remark: form.remark,
alarmGroup: form.alarmGroup,
alarmLevel: form.alarmLevel,
alarmIsEnable: 1,
alarmMsgLag: 10000,
alarmDelayTime: 300000,
alarmMsgLag: form.alarmMsgLag,
alarmDelayTime: form.alarmDelayTime,
extraParams: {},
broadcastConsume: 1,
consumeMode: 1,
Expand Down
11 changes: 9 additions & 2 deletions carrera-console/carrera-console-fe/src/pages/subscribe/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@click="getSubscribeList"></bc-button>
<bc-button icon="plus"
type="primary"
@click="handleCreateSubscribe">Subscription
@click="handleCreateSubscribe">Add
</bc-button>
<bc-button-group>
<bc-button type="gray"
Expand Down Expand Up @@ -71,6 +71,13 @@
<span :class="coloringText('topic', 'states', parseInt(scope.record.state,10))">{{dictTranslate('topic','states', parseInt(scope.record.state, 10))}}</span>
</template>
</bc-table-column>

<bc-table-column field="remark" index="remark" label="Remark">
<template slot-scope="scope">
{{scope.record.remark}}
</template>
</bc-table-column>

<bc-table-column field="operate" index="operate" label="Operation" width="350px">
<template slot-scope="scope">
<a class="text-link" @click="handleDetail(scope.record)">Detail</a>
Expand All @@ -85,7 +92,7 @@
query: {
topicId: scope.record.topicId,
topicName: scope.record.topicName,
},}">Consume Progress
},}">Progress
</router-link>
</template>
</bc-table-column>
Expand Down
Loading