(dubbo) branch 3.3 updated: Remove dubbo monitor module (#13456)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 5b0b86b11d Remove dubbo monitor module (#13456)
5b0b86b11d is described below
commit 5b0b86b11d2ae10984b01eaeca02b736e7c1dd48
Author: huazhongming
AuthorDate: Mon Dec 18 14:11:33 2023 +0800
Remove dubbo monitor module (#13456)
Signed-off-by: crazyhzm
---
.artifacts | 4 -
dubbo-config/dubbo-config-api/pom.xml | 5 -
dubbo-config/dubbo-config-spring/pom.xml | 12 -
dubbo-dependencies-bom/pom.xml | 23 --
dubbo-distribution/dubbo-all-shaded/pom.xml| 18 -
dubbo-distribution/dubbo-all/pom.xml | 26 --
dubbo-distribution/dubbo-bom/pom.xml | 23 --
dubbo-distribution/dubbo-core-spi/pom.xml | 8 -
dubbo-metadata/dubbo-metadata-processor/pom.xml| 4 -
.../java/org/apache/dubbo/monitor/Constants.java | 1 +
.../java/org/apache/dubbo/monitor/Monitor.java | 1 +
.../org/apache/dubbo/monitor/MonitorFactory.java | 3 +-
.../org/apache/dubbo/monitor/MonitorService.java | 1 +
.../monitor/support/MonitorClusterFilter.java | 1 +
.../dubbo/monitor/support/MonitorFilter.java | 1 +
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 +
...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 +
.../dubbo/monitor/support/MonitorFilterTest.java | 0
dubbo-monitor/dubbo-monitor-api/pom.xml| 40 --
.../org/apache/dubbo/monitor/MetricsService.java | 26 --
dubbo-monitor/dubbo-monitor-common/pom.xml | 50 ---
.../monitor/support/AbstractMonitorFactory.java| 120 --
.../monitor/support/MetricsServiceDetector.java| 33 --
.../monitor/support/MonitorServiceDetector.java| 28 --
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 -
...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 -
...g.apache.dubbo.rpc.model.BuiltinServiceDetector | 2 -
.../support/AbstractMonitorFactoryTest.java| 99 -
.../src/test/resources/log4j2-test.xml | 29 --
dubbo-monitor/dubbo-monitor-default/pom.xml| 86 -
.../apache/dubbo/monitor/dubbo/DubboMonitor.java | 238
.../dubbo/monitor/dubbo/DubboMonitorFactory.java | 69
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 296 ---
.../org/apache/dubbo/monitor/dubbo/Statistics.java | 216 ---
.../apache/dubbo/monitor/dubbo/StatisticsItem.java | 140 ---
.../org.apache.dubbo.monitor.MonitorFactory| 1 -
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 -
.../dubbo/monitor/dubbo/AppResponseBuilder.java| 55 ---
.../monitor/dubbo/DubboMonitorFactoryTest.java | 70
.../dubbo/monitor/dubbo/DubboMonitorTest.java | 275 --
.../dubbo/monitor/dubbo/MetricsFilterTest.java | 421 -
.../dubbo/monitor/dubbo/MockMonitorService.java| 43 ---
.../apache/dubbo/monitor/dubbo/StatisticsTest.java | 109 --
.../dubbo/monitor/dubbo/service/DemoService.java | 28 --
.../src/test/resources/dubbo.properties| 2 -
.../src/test/resources/log4j2-test.xml | 29 --
dubbo-monitor/pom.xml | 48 ---
dubbo-test/dubbo-dependencies-all/pom.xml | 16 -
pom.xml| 1 -
49 files changed, 9 insertions(+), 2697 deletions(-)
diff --git a/.artifacts b/.artifacts
index d0e292d3a8..ace6eec3e6 100644
--- a/.artifacts
+++ b/.artifacts
@@ -62,10 +62,6 @@ dubbo-metrics-registry
dubbo-metrics-config-center
dubbo-metrics-netty
dubbo-metrics-event
-dubbo-monitor
-dubbo-monitor-api
-dubbo-monitor-common
-dubbo-monitor-default
dubbo-native
dubbo-parent
dubbo-plugin
diff --git a/dubbo-config/dubbo-config-api/pom.xml
b/dubbo-config/dubbo-config-api/pom.xml
index e57e02cbed..5f8c343abd 100644
--- a/dubbo-config/dubbo-config-api/pom.xml
+++ b/dubbo-config/dubbo-config-api/pom.xml
@@ -78,11 +78,6 @@
${project.parent.version}
-
- org.apache.dubbo
- dubbo-monitor-api
- ${project.parent.version}
-
org.apache.dubbo
dubbo-remoting-api
diff --git a/dubbo-config/dubbo-config-spring/pom.xml
b/dubbo-config/dubbo-config-spring/pom.xml
index 1f201c0b37..983d0b0547 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -77,12 +77,6 @@
1.9.20.1
test
-
- org.apache.dubbo
- dubbo-monitor-default
- ${project.parent.version}
- test
-
org.apache.dubbo
dubbo-rpc-dubbo
@@ -149,12 +143,6 @@
${project.parent.version}
test
-
- org.apache.dubbo
- dubbo-monitor-common
-
(dubbo-kubernetes) branch master updated (928ab8ba -> ea38a28c)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
from 928ab8ba Merge pull request #115 from
jianyi-gronk/fix/ui/add_dependency
new 759820a1 doc(metrics): use iframe to show metrics Note: now is a
demo url with same origin of mock api make sure the real grafana-url's
X-Frame-Options is forbidden
new a6671619 Merge branch 'apache:master' into feature/ui/metrics
new ea38a28c Merge pull request #112 from Helltab/feature/ui/metrics
The 953 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/mock/{mockCluster.js => mockCluster.ts}| 9 +---
.../src/api/mock/{mockServer.js => mockServer.ts} | 15 ---
.../api/mock/{mockVersion.js => mockVersion.ts}| 0
.../api/service/{clusterInfo.ts => serverInfo.ts} | 7 +--
ui-vue3/src/main.ts| 13 +++---
ui-vue3/src/views/home/index.vue | 50 --
ui-vue3/src/views/metrics/index.vue| 14 +-
ui-vue3/vite.config.ts | 43 ---
8 files changed, 88 insertions(+), 63 deletions(-)
rename ui-vue3/src/api/mock/{mockCluster.js => mockCluster.ts} (80%)
rename ui-vue3/src/api/mock/{mockServer.js => mockServer.ts} (70%)
rename ui-vue3/src/api/mock/{mockVersion.js => mockVersion.ts} (100%)
copy ui-vue3/src/api/service/{clusterInfo.ts => serverInfo.ts} (85%)
(dubbo-kubernetes) branch master updated: fix: add dependency
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 8c4ccbd1 fix: add dependency
new 928ab8ba Merge pull request #115 from
jianyi-gronk/fix/ui/add_dependency
8c4ccbd1 is described below
commit 8c4ccbd13513c403d83523c121079d1f36bfb2ee
Author: jianyi-gronk
AuthorDate: Sun Dec 17 19:20:56 2023 +0800
fix: add dependency
---
ui-vue3/package.json | 4 +-
ui-vue3/yarn.lock| 433 ++-
2 files changed, 260 insertions(+), 177 deletions(-)
diff --git a/ui-vue3/package.json b/ui-vue3/package.json
index daa3071b..c2aed43c 100644
--- a/ui-vue3/package.json
+++ b/ui-vue3/package.json
@@ -24,10 +24,12 @@
"ant-design-vue": "4.x",
"less": "^4.2.0",
"lodash": "^4.17.21",
+"mockjs": "^1.1.0",
"pinia": "^2.1.7",
"vue": "^3.3.10",
"vue-i18n": "^9.8.0",
-"vue-router": "^4.2.5"
+"vue-router": "^4.2.5",
+"vue3-colorpicker": "^2.2.3"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.3.3",
diff --git a/ui-vue3/yarn.lock b/ui-vue3/yarn.lock
index 81715781..7949a908 100644
--- a/ui-vue3/yarn.lock
+++ b/ui-vue3/yarn.lock
@@ -7,6 +7,11 @@
resolved
"https://registry.npmmirror.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf;
integrity
sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+"@aesoper/normal-utils@^0.1.5":
+ version "0.1.5"
+ resolved
"https://registry.npmmirror.com/@aesoper/normal-utils/-/normal-utils-0.1.5.tgz#82b7c899ab9670c55515f949a3766d24260b8039;
+ integrity
sha512-LFF/6y6h5mfwhnJaWqqxuC8zzDaHCG62kMRkd8xhDtq62TQj9dM17A9DhE87W7DhiARJsHLgcina/9P4eNCN1w==
+
"@ampproject/remapping@^2.2.0":
version "2.2.1"
resolved
"https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630;
@@ -725,10 +730,10 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
-"@eslint/js@8.55.0":
- version "8.55.0"
- resolved
"https://registry.npmmirror.com/@eslint/js/-/js-8.55.0.tgz#b721d52060f369aa259cf97392403cb9ce892ec6;
- integrity
sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==
+"@eslint/js@8.56.0":
+ version "8.56.0"
+ resolved
"https://registry.npmmirror.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b;
+ integrity
sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
"@hapi/hoek@^9.0.0":
version "9.3.0"
@@ -762,9 +767,9 @@
integrity
sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
"@iconify/json@^2.2.157":
- version "2.2.157"
- resolved
"https://registry.npmmirror.com/@iconify/json/-/json-2.2.157.tgz#4df8a93f8d4356c827c820e38020b3fb94784155;
- integrity
sha512-mKBFQz5BqP5TGgugb0AmL7bYi7rO5jxoWQO0m7XM82ZpPRn8/BTiUW/tr2knOU2ODcmg9W/pQOAXEpkR48So9g==
+ version "2.2.158"
+ resolved
"https://registry.npmmirror.com/@iconify/json/-/json-2.2.158.tgz#2be9088196174fabba90d320afd026c4dff7ebe6;
+ integrity
sha512-6foGYcG97nmYpJ7N0MAbtfH7SKf7RvoOCYYSBi8gs+8qopXzplIP2F4lQiLrjpbPQihAoTercmGYWi4ABxLX1A==
dependencies:
"@iconify/types" "*"
pathe "^1.1.0"
@@ -910,75 +915,80 @@
picocolors "^1.0.0"
tslib "^2.6.0"
-"@rollup/rollup-android-arm-eabi@4.9.0":
- version "4.9.0"
- resolved
"https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.0.tgz#0437b27edd7095d0b6d5db99d13af8157d7c58b0;
- integrity
sha512-+1ge/xmaJpm1KVBuIH38Z94zj9fBD+hp+/5WLaHgyY8XLq1ibxk/zj6dTXaqM2cAbYKq8jYlhHd6k05If1W5xA==
-
-"@rollup/rollup-android-arm64@4.9.0":
- version "4.9.0"
- resolved
"https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.0.tgz#d4c14ef9e45d5c46b8d1f611ab8124a611d5be5b;
- integrity
sha512-im6hUEyQ7ZfoZdNvtwgEJvBWZYauC9KVKq1w58LG2Zfz6zMd8gRrbN+xCVoqA2hv/v6fm9lp5LFGJ3za8EQH3A==
-
-"@rollup/rollup-darwin-arm64@4.9.0":
- version "4.9.0"
- resolved
"https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.0.tgz#6f3fdf5712db6b5e3d8f62a86a09cd659dd871f9;
- integrity
sha512-u7aTMskN6Dmg1lCT0QJ+tINRt+ntUrvVkhbPfFz4bCwRZvjItx2nJtwJnJRlKMMaQCHRjrNqHRDYvE4mBm3DlQ==
-
-"@rollup/rollup-darwin-x64@4.9.0":
- version "4.9.0"
- resolved
"https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.0.tgz#626d7786fe7c10b2e8533ad981b4a791fd72b9d0;
- integrity
sha512-8FvEl3w2ExmpcOmX5RJD0yqXcVSOqAJJUJ29Lca29Ik+3zPS1yFimr2fr5JSZ4Z5gt8/d7WqycpgkX9nocijSw==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.9.0":
- version "4.9.0"
- resolved
