Skip to content

Commit e9f6b0a

Browse files
committed
fix: wrap prometheus error
1 parent 0eff9c9 commit e9f6b0a

File tree

198 files changed

+126
-2571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+126
-2571
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ bin/
4545
build/
4646
vendor/
4747

48-
# dubbo cp cache
49-
app/dubbo-cp/cache
48+
49+
app/dubbo-ui/dist

app/dubbo-admin/dubbo-admin.yaml

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,67 +15,67 @@
1515

1616
mode: zone
1717
console:
18-
grafana: xx
19-
prometheus: xx
20-
jaeger: xx
18+
grafana:
19+
prometheus:
20+
jaeger:
2121
dashboards:
2222
metric:
23-
application: xx
24-
instance: xx
25-
service: xx
23+
application:
24+
instance:
25+
service:
2626
trace:
27-
application: xx
28-
instance: xx
29-
service: xx
27+
application:
28+
instance:
29+
service:
3030
log:
31-
application: xx
32-
instance: xx
33-
service: xx
31+
application:
32+
instance:
33+
service:
3434
auth:
3535
user: admin
3636
password: dubbo@2025
3737
expirationTime: 3600
3838
store:
39-
type: memory
40-
# type: mysql
41-
# address: root:123456@tcp(127.0.0.1:23306)/dubbo-admin?charset=utf8mb4&parseTime=True&loc=Asia%2FShanghai
39+
# type: memory
40+
type: mysql
41+
address: root:123456@tcp(127.0.0.1:23306)/dubbo-admin?charset=utf8mb4&parseTime=True&loc=Asia%2FShanghai
4242
discovery:
4343
- type: nacos2
4444
name: localhost-nacos
4545
id: localhost-nacos
4646
address:
47-
registry: nacos://127.0.0.1:28848?username=nacos&password=nacos
48-
configCenter: nacos://127.0.0.1:28848?username=nacos&password=nacos
49-
metadataReport: nacos://127.0.0.1:28848?username=nacos&password=nacos
47+
registry: nacos://101.34.253.152:30848?username=nacos&password=nacos
48+
configCenter: nacos://101.34.253.152:30848?username=nacos&password=nacos
49+
metadataReport: nacos://101.34.253.152:30848?username=nacos&password=nacos
5050
properties:
5151
# [Nacos2] Adjust the interval(time unit is `s`) to adjust the frequency of list-all configs in nacos.
5252
# Default period is 30s
5353
configWatchPeriod: 20
5454
# [Nacos2] Adjust the interval(time unit is `s`) to adjust the frequency of list-all services in nacos.
5555
# Default period is 30s
5656
serviceWatchPeriod: 20
57-
- type: zookeeper
58-
name: 本地zookeeper
59-
id: zk3.6
60-
address:
61-
registry: zookeeper://127.0.0.1:2181
62-
configCenter: zookeeper://127.0.0.1:2181
63-
metadataReport: zookeeper://127.0.0.1:2181
57+
# - type: zookeeper
58+
# name: 本地zookeeper
59+
# id: zk3.6
60+
# address:
61+
# registry: zookeeper://127.0.0.1:2181
62+
# configCenter: zookeeper://127.0.0.1:2181
63+
# metadataReport: zookeeper://127.0.0.1:2181
6464

6565
# mock discovery is only for development
6666
# - type: mock
6767
# id: mock
6868
# name: mockRegistry
6969
engine:
70-
id: mock
71-
name: mock
72-
type: mock
73-
# id: k8s1.23.5
74-
# name: k8s1.28.6
75-
# type: kubernetes
76-
# properties:
77-
# [Kubernetes] Path to kubernetes config file, if not set, will use in cluster config
78-
# kubeConfigPath: /root/.kube/config
70+
# id: mock
71+
# name: mock
72+
# type: mock
73+
id: default
74+
name: k8s1.28.6
75+
type: kubernetes
76+
properties:
77+
# [Kubernetes] Path to kubernetes config file, if not set, will use in cluster config
78+
kubeConfigPath: /root/.kube/config
7979
# [Kubernetes] Watch pods with specified labels, if not set, will watch all pods
8080
# podWatchSelector: org.apache.dubbo/dubbo-apps=true
8181
# [Kubernetes] Identify which Dubbo app the pod belongs to, if not set, pod will not be seen as a dubbo instance at first
@@ -127,4 +127,3 @@ engine:
127127
# mainContainerChooseStrategy:
128128
# type: ByIndex
129129
# index: 0
130-
controlPlane:

app/dubbo-ui/dist/admin/assets/ByteUtil-YdHlSEeW.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/ConfigModel-MKHolGIX.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/ConfigPage-cVEIcX7I.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/ConfigPage-mi5cWaMW.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/DateUtil-7fmo4Hal.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/GrafanaPage-6ddnOjHp.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/GrafanaPage-RVDi4ROE.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/dubbo-ui/dist/admin/assets/Login--Yyb1v8O.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)