github
/
ConsulManager
mirror of https://github.com/starsliao/ConsulManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

v0.9.0alpha

pull/42/head
StarsL.cn 2022-11-01 01:24:55 +08:00
parent 304dc1e1c3
commit db923ef9bc
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -7,17 +7,17 @@ build:
echo -e "\n\n自行编译的版本，注意修改docker-compose.yml中的镜像地址为本地仓库后再启动。\nBlackbox-Manager:\nhttp://{ip}:1026\n"
push:
docker login --username=starsliao@163.com registry.cn-shenzhen.aliyuncs.com
docker tag nginx-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
docker tag nginx-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:${ver}
docker tag flask-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest
docker tag flask-consul:latest registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:${ver}
docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:${ver}
docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest
docker push registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:${ver}
docker tag nginx-consul:tensuns-latest registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:tensuns-latest
docker push registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:tensuns-latest
#docker login --username=starsliao@163.com registry.cn-shenzhen.aliyuncs.com
docker tag nginx-consul:latest swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:latest
docker tag nginx-consul:latest swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:${ver}
docker tag flask-consul:latest swr.cn-south-1.myhuaweicloud.com/starsl.cn/flask-consul:latest
docker tag flask-consul:latest swr.cn-south-1.myhuaweicloud.com/starsl.cn/flask-consul:${ver}
docker push swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:latest
docker push swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:${ver}
docker push swr.cn-south-1.myhuaweicloud.com/starsl.cn/flask-consul:latest
docker push swr.cn-south-1.myhuaweicloud.com/starsl.cn/flask-consul:${ver}
docker tag nginx-consul:tensuns-latest swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:tensuns-latest
docker push swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:tensuns-latest
update:
docker-compose pull && docker-compose up -d

4
docker-compose.yml
View File

@ -1,7 +1,7 @@
version: "3.2"
services:
flask-consul:
image: registry.cn-shenzhen.aliyuncs.com/starsl/flask-consul:latest
image: swr.cn-south-1.myhuaweicloud.com/starsl.cn/flask-consul:latest
container_name: flask-consul
hostname: flask-consul
restart: always
@ -12,7 +12,7 @@ services:
consul_url: http://x.x.x.x:8500/v1
admin_passwd: xxxxxxxx
nginx-consul:
image: registry.cn-shenzhen.aliyuncs.com/starsl/nginx-consul:latest
image: swr.cn-south-1.myhuaweicloud.com/starsl.cn/nginx-consul:latest
container_name: nginx-consul
hostname: nginx-consul
restart: always

8
flask-consul/requirements.txt
View File

@ -10,10 +10,10 @@ xlrd==1.2.0
#pyDes==2.0.1
pycryptodome==3.14.1
beautifulsoup4==4.11.1
huaweicloudsdkcore==3.0.95
huaweicloudsdkecs==3.0.95
huaweicloudsdkeps==3.0.95
huaweicloudsdkbss==3.0.95
huaweicloudsdkcore==3.1.5
huaweicloudsdkecs==3.1.5
huaweicloudsdkeps==3.1.5
huaweicloudsdkbss==3.1.5
huaweicloudsdkrds==3.1.5
alibabacloud_resourcemanager20200331==2.1.0
alibabacloud_ecs20140526==2.1.0

2
vue-consul/src/main.js
View File

@ -46,7 +46,7 @@ Object.keys(filters).forEach(key => {
})
Vue.config.productionTip = false
Vue.prototype.VER = 'v0.8.1'
Vue.prototype.VER = 'v0.9.0'
new Vue({
el: '#app',

10
vue-consul/src/views/dashboard/index.vue
View File

@ -4,6 +4,16 @@
<el-link :underline="false" type="primary" icon="el-icon-star-on" href="https://github.com/starsliao/ConsulManager" target="_blank" class="dashboard-text">StarsL.cn</el-link>
</el-badge>
<el-timeline>
<el-timeline-item timestamp="2022/10/31" placement="top">
<el-card>
<h4>v0.9.0</h4>
<p><el-button type="warning" size="mini" icon="el-icon-star-off" circle />镜像存储更换到华为云，请查看仓库根目录下的<el-link href="https://github.com/starsliao/ConsulManager/blob/main/docker-compose.yml" target="_blank">docker-compose.yml</el-link>，更新您的镜像地址。</p>
<p><el-button type="success" size="mini" icon="el-icon-star-off" circle />增加RDS云数据库监控接入：支持同步阿里、华为云的RDS信息到Consul并接入到Prometheus监控！</p>
<p>增加了MySQL的Grafana监控看板。</p>
<p>增加了从Consul同步RDS到Prometheus的配置生成界面，可生成Prometheus的配置。</p>
<p>增加了RDS的Prometheus告警规则信息生成页面。</p>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="2022/7/26" placement="top">
<el-card>
<h4>v0.8.1</h4>