(skywalking) branch master updated: Support Nginx monitoring. (#11558)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 8bff0aa38d Support Nginx monitoring. (#11558) 8bff0aa38d is described below commit 8bff0aa38ddbaa711c3297df12ca1a5ab253cee8 Author: weixiang1862 <652048...@qq.com> AuthorDate: Fri Nov 17 14:16:10 2023 +0800 Support Nginx monitoring. (#11558) --- .github/workflows/skywalking.yaml | 2 + docs/en/changes/changes.md | 1 + docs/en/setup/backend/backend-nginx-monitoring.md | 141 ++ docs/menu.yml | 2 + .../skywalking/oap/server/core/analysis/Layer.java | 7 +- .../ui/template/UITemplateInitializer.java | 1 + .../src/main/resources/application.yml | 8 +- .../src/main/resources/lal/nginx.yaml | 60 + .../src/main/resources/log-mal-rules/nginx.yaml| 36 +++ .../resources/otel-rules/nginx/nginx-endpoint.yaml | 49 .../resources/otel-rules/nginx/nginx-instance.yaml | 51 .../resources/otel-rules/nginx/nginx-service.yaml | 51 .../resources/ui-initialized-templates/menu.yaml | 5 + .../nginx/nginx-endpoint.json | 166 .../nginx/nginx-instance.json | 214 +++ .../ui-initialized-templates/nginx/nginx-root.json | 47 .../nginx/nginx-service.json | 294 + test/e2e-v2/cases/nginx/Dockerfile.nginx | 19 ++ test/e2e-v2/cases/nginx/docker-compose.yml | 72 + test/e2e-v2/cases/nginx/e2e.yaml | 96 +++ test/e2e-v2/cases/nginx/expected/logs.yml | 34 +++ .../nginx/expected/metrics-has-value-label.yml | 35 +++ .../cases/nginx/expected/metrics-has-value.yml | 31 +++ .../cases/nginx/expected/service-endpoint.yml | 19 ++ .../cases/nginx/expected/service-instance.yml | 22 ++ test/e2e-v2/cases/nginx/expected/service.yml | 24 ++ test/e2e-v2/cases/nginx/fluent-bit-script.lua | 36 +++ test/e2e-v2/cases/nginx/fluent-bit.conf| 48 test/e2e-v2/cases/nginx/nginx.conf | 74 ++ test/e2e-v2/cases/nginx/otel-collector-config.yaml | 44 +++ 30 files changed, 1684 insertions(+), 5 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 12d60d7d10..488588ac14 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -611,6 +611,8 @@ jobs: - name: Zipkin BanyanDB config: test/e2e-v2/cases/zipkin/banyandb/e2e.yaml + - name: Nginx +config: test/e2e-v2/cases/nginx/e2e.yaml - name: APISIX metrics config: test/e2e-v2/cases/apisix/otel-collector/e2e.yaml - name: Exporter Kafka diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 99a6978f11..679064c655 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -42,6 +42,7 @@ * Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue implementation. * Change the policy of the queue(DataCarrier) in the L1 metric aggregate worker to IF_POSSIBLE mode. * Add self-observability metric `metrics_aggregator_abandon` to count the number of abandon metrics. +* Support Nginx monitoring. UI diff --git a/docs/en/setup/backend/backend-nginx-monitoring.md b/docs/en/setup/backend/backend-nginx-monitoring.md new file mode 100644 index 00..696aa93db8 --- /dev/null +++ b/docs/en/setup/backend/backend-nginx-monitoring.md @@ -0,0 +1,141 @@ +# Nginx monitoring +## Nginx performance from nginx-lua-prometheus +The [nginx-lua-prometheus](https://github.com/knyar/nginx-lua-prometheus) is a lua library that can be used with Nginx to collect metrics +and expose them on a separate web page. +To use this library, you will need Nginx with [lua-nginx-module](https://github.com/openresty/lua-nginx-module) or directly [OpenResty](https://openresty.org/). + +SkyWalking leverages OpenTelemetry Collector to transfer the metrics to [OpenTelemetry receiver](opentelemetry-receiver.md) and into the [Meter System](./../../concepts-and-designs/meter.md). + +### Data flow +1. [nginx-lua-prometheus](https://github.com/knyar/nginx-lua-prometheus) collects metrics from Nginx and expose them to an endpoint. +2. OpenTelemetry Collector fetches metrics from the endpoint expose above via Prometheus Receiver and pushes metrics to SkyWalking OAP Server via OpenTelemetry gRPC exporter. +3. The SkyWalking OAP Server parses the expression with [MAL](../../concepts-and-designs/mal.md) to filter/calculate/aggregate and store the results. + +### Set up +1. Collect Nginx metrics and expose the following four metrics by [nginx-lua-prometheus](http
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng merged PR #11558: URL: https://github.com/apache/skywalking/pull/11558 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support Nginx monitoring. [skywalking]
wu-sheng closed issue #11534: [Feature] Support Nginx monitoring. URL: https://github.com/apache/skywalking/issues/11534 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1815798282 > > And I believe another blog to introduce your new thing would be cool. This should be more powerful than you introduced in the last one. WDYT? > > Yes, I will add a new blog to introduce it and add it to showcase, I think they will be ok in the end of this month. The time is totally flexible, and up to your reality. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1815796708 > And I believe another blog to introduce your new thing would be cool. This should be more powerful than you introduced in the last one. WDYT? Yes, I will add a new blog to introduce it and add it to showcase, I think they will be ok in the end of this month. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1815790518 And I believe another blog to introduce your new thing would be cool. This should be more powerful than you introduced in the last one. WDYT? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1815789134 @weixiang1862 Generally, this should be good. I will wait for others' review. And would you be able to add Nginx monitoring -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on code in PR #11558: URL: https://github.com/apache/skywalking/pull/11558#discussion_r1396717942 ## docs/en/setup/backend/backend-nginx-monitoring.md: ## @@ -0,0 +1,141 @@ +# Nginx monitoring +## Nginx performance from nginx-lua-prometheus +The [nginx-lua-prometheus](https://github.com/openresty/lua-nginx-module) is a lua library that can be used with Nginx to collect metrics Review Comment: Yes, thanks. I will fix this. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-booster-ui) branch main updated: fix: change log widget and loading mask style (#340)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 02c57248 fix: change log widget and loading mask style (#340)
02c57248 is described below
commit 02c572485967a8ee41cb63d649d5141e9ca5e721
Author: Fine0830
AuthorDate: Fri Nov 17 13:16:48 2023 +0800
fix: change log widget and loading mask style (#340)
---
src/styles/theme.scss | 4
src/views/dashboard/related/log/LogTable/LogDetail.vue | 6 ++
src/views/dashboard/related/log/LogTable/LogService.vue | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 56e8fe13..e41085c3 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -157,6 +157,10 @@ $active-background: var(--el-color-primary);
$font-size-smaller: 12px;
$font-size-normal: 14px;
+.el-loading-mask {
+ background-color: var(--theme-background);
+}
+
.el-menu {
--el-menu-item-height: 50px;
}
diff --git a/src/views/dashboard/related/log/LogTable/LogDetail.vue
b/src/views/dashboard/related/log/LogTable/LogDetail.vue
index 3cb92193..cf6def6f 100644
--- a/src/views/dashboard/related/log/LogTable/LogDetail.vue
+++ b/src/views/dashboard/related/log/LogTable/LogDetail.vue
@@ -20,7 +20,7 @@ limitations under the License. -->
{{ dateFormat(currentLog[item.label]) }}
.content {
-max-width: 700px;
-min-width: 500px;
min-height: 500px;
border: none;
outline: none;
color: $font-color;
overflow: auto;
-padding: 5px;
+background-color: var(--el-dialog-bg-color);
}
diff --git a/src/views/dashboard/related/log/LogTable/LogService.vue
b/src/views/dashboard/related/log/LogTable/LogService.vue
index 61cb4ffb..cfcfab1f 100644
--- a/src/views/dashboard/related/log/LogTable/LogService.vue
+++ b/src/views/dashboard/related/log/LogTable/LogService.vue
@@ -25,9 +25,9 @@ limitations under the License. -->
{{ dateFormat(data.timestamp) }}
>
-
+
-
+
{{ data[item.label] }}
Re: [PR] fix: change log widget and loading mask style [skywalking-booster-ui]
wu-sheng merged PR #340: URL: https://github.com/apache/skywalking-booster-ui/pull/340 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix: change log widget and loading mask style [skywalking-booster-ui]
Fine0830 opened a new pull request, #340: URL: https://github.com/apache/skywalking-booster-ui/pull/340 Video https://github.com/apache/skywalking-booster-ui/assets/20871783/d5523de7-cd04-4113-8458-2954d10ba569 Signed-off-by: Qiuxia Fan -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
spacewander commented on code in PR #11558: URL: https://github.com/apache/skywalking/pull/11558#discussion_r1396686602 ## docs/en/setup/backend/backend-nginx-monitoring.md: ## @@ -0,0 +1,141 @@ +# Nginx monitoring +## Nginx performance from nginx-lua-prometheus +The [nginx-lua-prometheus](https://github.com/openresty/lua-nginx-module) is a lua library that can be used with Nginx to collect metrics Review Comment: The link is wrong? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1815710227 accesslog http.status_code & errorlog level is searchable:   -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] New MAL/LAL script mount doesn't work properly [skywalking]
wu-sheng closed issue #11559: [Bug] New MAL/LAL script mount doesn't work properly URL: https://github.com/apache/skywalking/issues/11559 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-showcase) branch main updated: Apply new log theme
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git The following commit(s) were added to refs/heads/main by this push: new a4da68e Apply new log theme a4da68e is described below commit a4da68e737e5ce9af49d8c782e91e0f841931967 Author: 吴晟 Wu Sheng AuthorDate: Fri Nov 17 10:38:42 2023 +0800 Apply new log theme --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index ac0509f..d604916 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,10 +29,10 @@ ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss ES_IMAGE_TAG ?= 7.10.2 SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap -SW_OAP_IMAGE_TAG ?= 798c55ce8ac4124498474de65ecf1d631bf3904a +SW_OAP_IMAGE_TAG ?= cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui -SW_UI_IMAGE_TAG ?= 798c55ce8ac4124498474de65ecf1d631bf3904a +SW_UI_IMAGE_TAG ?= cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:0883266bfaa36612927b69e35781b64ea181758d SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
(skywalking) branch master updated: sync ui (#11560)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new cb3e830f08 sync ui (#11560) cb3e830f08 is described below commit cb3e830f088ad74b4c0ab565d59cd690ec4bfaf6 Author: Fine0830 AuthorDate: Fri Nov 17 10:33:59 2023 +0800 sync ui (#11560) --- docs/en/changes/changes.md | 2 ++ skywalking-ui | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index bef119bce2..99a6978f11 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -61,6 +61,8 @@ * Refactor Logs view. * Implement the Dark Theme. * Change UI templates for Text widgets. +* Add Nginx menu i18n. +* Fix the height for trace widget. Documentation diff --git a/skywalking-ui b/skywalking-ui index a4271bb479..c6d1c49569 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit a4271bb4797034e5921e4ef795cb6df131cdc8c8 +Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b
Re: [PR] Sync UI [skywalking]
wu-sheng merged PR #11560: URL: https://github.com/apache/skywalking/pull/11560 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Sync UI [skywalking]
Fine0830 opened a new pull request, #11560: URL: https://github.com/apache/skywalking/pull/11560 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [x] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/changes.md). * Add Nginx menu i18n. * Fix the height for trace widget. Signed-off-by: Qiuxia Fan -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking-booster-ui) branch main updated: refactor: enhance the Log widget (#339)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new c6d1c495 refactor: enhance the Log widget (#339)
c6d1c495 is described below
commit c6d1c495699c2f55cd9abe79233b802c69454a5b
Author: Fine0830
AuthorDate: Fri Nov 17 10:15:39 2023 +0800
refactor: enhance the Log widget (#339)
---
src/styles/theme.scss | 6 +++-
src/views/dashboard/related/log/LogTable/Index.vue | 5 ++--
.../dashboard/related/log/LogTable/LogDetail.vue | 1 +
.../dashboard/related/log/LogTable/LogService.vue | 34 --
src/views/dashboard/related/log/LogTable/data.ts | 10 +++
.../related/trace/components/Table/TableItem.vue | 2 --
6 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 2fb0dd27..56e8fe13 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -15,6 +15,10 @@
* limitations under the License.
*/
@use "element-plus/theme-chalk/src/dark/css-vars.scss" as *;
+:root {
+ --sw-green: #70c877;
+ --sw-orange: #e6a23c;
+}
html {
--el-color-primary: #409eff;
@@ -58,7 +62,7 @@ html {
}
html.dark {
- --el-color-primary: rgb(64, 158, 255);
+ --el-color-primary: #409eff;
--theme-background: #212224;
--font-color: #fafbfc;
--disabled-color: #ccc;
diff --git a/src/views/dashboard/related/log/LogTable/Index.vue
b/src/views/dashboard/related/log/LogTable/Index.vue
index 125345e3..0162ca5f 100644
--- a/src/views/dashboard/related/log/LogTable/Index.vue
+++ b/src/views/dashboard/related/log/LogTable/Index.vue
@@ -88,7 +88,7 @@ limitations under the License. -->
border-bottom: 1px solid var(--sw-trace-list-border);
.traceId {
- width: 140px;
+ width: 20px;
}
.content {
@@ -96,7 +96,7 @@ limitations under the License. -->
}
.tags {
- width: 100px;
+ width: 15px;
}
.serviceName {
@@ -107,7 +107,6 @@ limitations under the License. -->
.log-header div {
padding: 0 5px;
border: 1px solid transparent;
-border-right: 1px dotted silver;
line-height: 30px;
background-color: var(--sw-table-header);
overflow: hidden;
diff --git a/src/views/dashboard/related/log/LogTable/LogDetail.vue
b/src/views/dashboard/related/log/LogTable/LogDetail.vue
index 6a17b2cc..3cb92193 100644
--- a/src/views/dashboard/related/log/LogTable/LogDetail.vue
+++ b/src/views/dashboard/related/log/LogTable/LogDetail.vue
@@ -73,5 +73,6 @@ limitations under the License. -->
outline: none;
color: $font-color;
overflow: auto;
+padding: 5px;
}
diff --git a/src/views/dashboard/related/log/LogTable/LogService.vue
b/src/views/dashboard/related/log/LogTable/LogService.vue
index bd388723..61cb4ffb 100644
--- a/src/views/dashboard/related/log/LogTable/LogService.vue
+++ b/src/views/dashboard/related/log/LogTable/LogService.vue
@@ -24,10 +24,12 @@ limitations under the License. -->
{{ dateFormat(data.timestamp) }}
-
-{{ level }}
-
- trace
+ >
+
+
+
+
+
{{ data[item.label] }}
@@ -87,6 +89,9 @@ limitations under the License. -->
.traceId {
cursor: pointer;
+ width: 20px;
+ text-align: center;
+ position: relative;
span {
display: inline-block;
@@ -94,12 +99,16 @@ limitations under the License. -->
}
.blue {
-color: #448dfe;
+color: var(--el-color-primary);
}
}
.tags {
- width: 100px;
+ width: 15px;
+ text-align: center;
+ color: var(--sw-green);
+ font-weight: 400;
+ font-size: 14px;
}
.content {
@@ -112,15 +121,14 @@ limitations under the License. -->
}
.log-item:hover {
-background: rgb(0 0 0 / 4%);
+background: var(--sw-list-hover);
}
.log-item > div {
-width: 140px;
+width: 60px;
padding: 0 5px;
display: inline-block;
border: 1px solid transparent;
-border-right: 1px dotted silver;
white-space: normal;
word-break: break-all;
overflow: hidden;
@@ -137,4 +145,12 @@ limitations under the License. -->
height: 100%;
padding: 3px 8px;
}
+
+ .error {
+color: var(--sw-orange);
+ }
+
+ .warning {
+color: var(--sw-orange);
+ }
diff --git a/src/views/dashboard/related/log/LogTable/data.ts
b/src/views/dashboard/related/log/LogTable/data.ts
index 0978688d..96f42aa3 100644
--- a/src/views/dashboard/related/log/LogTable/data.ts
+++ b/src/views/dashboard/related/log/LogTable/data.ts
@@ -16,18 +16,18 @@
*/
export const ServiceLogConstants = [
- {
-label: "content",
-value: "content",
- },
{
label: "tags",
-value: "level",
+value: "",
},
Re: [PR] refactor: enhance the Log widget [skywalking-booster-ui]
wu-sheng merged PR #339: URL: https://github.com/apache/skywalking-booster-ui/pull/339 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] refactor: enhance the Log widget [skywalking-booster-ui]
Fine0830 opened a new pull request, #339: URL: https://github.com/apache/skywalking-booster-ui/pull/339 Screenhots https://github.com/apache/skywalking-booster-ui/assets/20871783/5e2e6988-fbc1-4934-9169-dc082bb8452b";>  Signed-off-by: Qiuxia Fan -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
wu-sheng commented on code in PR #649:
URL: https://github.com/apache/skywalking-java/pull/649#discussion_r1396551680
##
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java:
##
@@ -37,15 +37,29 @@ public PostgreSQLURLParser(String url) {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
Review Comment:
Several things I noticed from the doc
- `postgresql://`, we should check what is the default path, and the peer
can't be null for analysis
- `postgresql:///mydb?host=localhost&port=5433`, host and port could be
given by parameters. We should support and connect them to make the peer.
- Please recheck on IPv6 case `postgresql://[2001:db8::1234]/database`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
CzyerChen commented on code in PR #649:
URL: https://github.com/apache/skywalking-java/pull/649#discussion_r1396542859
##
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java:
##
@@ -37,15 +37,29 @@ public PostgreSQLURLParser(String url) {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
Review Comment:
I learn from PostgreSQL documentation here
`https://www.postgresql.org/docs/16/libpq-connect.html`
The following examples illustrate valid URI syntax:
```
postgresql://
postgresql://localhost
postgresql://localhost:5433
postgresql://localhost/mydb
postgresql://user@localhost
postgresql://user:secret@localhost
postgresql://other@localhost/otherdb?connect_timeout=10&application_name=myapp
postgresql://host1:123,host2:456/somedb?target_session_attrs=any&application_name=myapp
```
and I tested 6 of them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
wu-sheng commented on PR #649: URL: https://github.com/apache/skywalking-java/pull/649#issuecomment-1815559089 > > I am not sure why, but the UTs on the Windows keep failing. > > all the new UTs added in URLParserTest? Don't worry about this. They are passed now. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
wu-sheng commented on code in PR #649:
URL: https://github.com/apache/skywalking-java/pull/649#discussion_r1396538667
##
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java:
##
@@ -37,15 +37,29 @@ public PostgreSQLURLParser(String url) {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
Review Comment:
Are there `jdbc:postgresql://localhost` and `jdbc:postgresql://` legal
connection URLs?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
CzyerChen commented on PR #649: URL: https://github.com/apache/skywalking-java/pull/649#issuecomment-1815553029 > I am not sure why, but the UTs on the Windows keep failing. all the new UTs added in URLParserTest? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
CzyerChen commented on code in PR #649:
URL: https://github.com/apache/skywalking-java/pull/649#discussion_r1396537060
##
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java:
##
@@ -37,15 +37,29 @@ public PostgreSQLURLParser(String url) {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
Review Comment:
It will call method `fetchDatabaseNameFromURL` in `AbstractURLParser` next,
the database name will be ""
```java
protected String fetchDatabaseNameFromURL() {
URLLocation hostsLocation = fetchDatabaseNameIndexRange(); // -->
return new URLLocation(0, 0);
return url.substring(hostsLocation.startIndex(),
hostsLocation.endIndex()); // --> substring will return ""
}
```
Test cases matched:
```java
@Test
public void testParsePostgresqlJDBCURLWithHostNoPortAndDb() {
ConnectionInfo connectionInfo = new
URLParser().parser("jdbc:postgresql://localhost");
assertThat(connectionInfo.getDBType(), is("PostgreSQL"));
assertThat(connectionInfo.getDatabaseName(), is(""));
assertThat(connectionInfo.getDatabasePeer(), is("localhost:5432"));
}
@Test
public void testParsePostgresqlJDBCURLEmpty() {
ConnectionInfo connectionInfo = new
URLParser().parser("jdbc:postgresql://");
assertThat(connectionInfo.getDBType(), is("PostgreSQL"));
assertThat(connectionInfo.getDatabaseName(), is(""));
assertThat(connectionInfo.getDatabasePeer(), is(":5432"));
}
```
The MysqlUrlParser may be better, but it rewrite `fetchDatabaseNameFromURL`
itself that not controlled by `AbstractURLParser`.
```java
protected String fetchDatabaseNameFromURL(int startSize) {
URLLocation hostsLocation = fetchDatabaseNameIndexRange(startSize);
if (hostsLocation == null) {
return "";
}
return url.substring(hostsLocation.startIndex(),
hostsLocation.endIndex());
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[I] [Bug] New MAL/LAL script mount doesn't work properly [skywalking]
wu-sheng opened a new issue, #11559: URL: https://github.com/apache/skywalking/issues/11559 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar issues. ### Apache SkyWalking Component Helm Chart (apache/skywalking-helm) ### What happened We had a discussion on slack channel, https://the-asf.slack.com/archives/CHQ1L4T54/p1700151046447729?thread_ts=1700139381.329769&cid=CHQ1L4T54 The scenario is we use `config` to mount a new custom LAL and/or MAL script file, and activate them through `SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES` ### What you expected to happen The script files should be mounted into init-container as well to make sure the table of database could be created properly. ### How to reproduce The slack channel has a way to indicate that. ### Anything else _No response_ ### Are you willing to submit a pull request to fix on your own? - [ ] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
wu-sheng commented on code in PR #649:
URL: https://github.com/apache/skywalking-java/pull/649#discussion_r1395734278
##
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/PostgreSQLURLParser.java:
##
@@ -37,15 +37,29 @@ public PostgreSQLURLParser(String url) {
protected URLLocation fetchDatabaseHostsIndexRange() {
int hostLabelStartIndex = url.indexOf("//");
int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2);
+if (hostLabelEndIndex == -1) {
+hostLabelEndIndex = url.length();
+}
return new URLLocation(hostLabelStartIndex + 2, hostLabelEndIndex);
}
@Override
protected URLLocation fetchDatabaseNameIndexRange() {
-int databaseStartTag = url.lastIndexOf("/");
-int databaseEndTag = url.indexOf("?", databaseStartTag);
+int databaseLabelStartIndex = url.indexOf("//");
+int databaseStartTag = url.indexOf("/", databaseLabelStartIndex + 2);
+int databaseEndTag = url.indexOf("?", databaseLabelStartIndex + 2);
+if (databaseEndTag < databaseStartTag && databaseEndTag != -1) {
+//database parse fail
+return new URLLocation(0, 0);
+}
+if (databaseStartTag == -1) {
+//database empty
+return new URLLocation(0, 0);
+}
Review Comment:
If we fail into this, what is the database name?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814468844 > ``` > log_format myformat '$remote_addr - $remote_user [$time_local] ' > '"$request" $status $body_bytes_sent ' > '"$http_referer" "$http_user_agent" ' > '"$http_x_forwarded_for"'; > > access_log /path/to/access.log myformat; > ``` > > I think we should extract `$status` from a defined format. And tag the error `level` and `http.status_code`. Also, add `http.status_code` into `searchableLogsTags`. ok, i will extract status and level tag. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814461374 ``` log_format myformat '$remote_addr - $remote_user [$time_local] ' '"$request" $status $body_bytes_sent ' '"$http_referer" "$http_user_agent" ' '"$http_x_forwarded_for"'; access_log /path/to/access.log myformat; ``` I think we should extract `$status` from a defined format. And tag the error `level` and `http.status_code`. Also, add `http.status_code` into `searchableLogsTags`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on code in PR #11558:
URL: https://github.com/apache/skywalking/pull/11558#discussion_r1395694103
##
oap-server/server-starter/src/main/resources/ui-initialized-templates/nginx/nginx-endpoint.json:
##
@@ -0,0 +1,166 @@
+[
+ {
+"id": "nginx-Endpoint",
+"configuration": {
+ "children": [
+{
+ "x": 0,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "0",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Request Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_requests"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "1",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Latency (ms)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_latency"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 16,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "2",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+"meter_nginx_endpoint_http_bandwidth/1024"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "widget": {
+"title": "HTTP Bandwidth (KB)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ }
+},
+{
+ "x": 0,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "3",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Status Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_status"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "4",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+
"(meter_nginx_endpoint_http_4xx_requests_increment/meter_nginx_endpoint_http_requests_increment)*100"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "graph": {
+"type": "Area",
+"opacity": 0.4,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "widget": {
+"title": "HTTP Status 4xx Percent (%)"
Review Comment:
Ok, I will change it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814433628 > > error.log has log level, accesslog doesn't. Should I set the default log level for accesslog? > > Which logs are you gathering from accesslog? The log output should include the level, isn't it? nginx output accesslog and errorlog in two files, I collect both of them. error log has log level but access log doesn't. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wankai123 commented on code in PR #11558:
URL: https://github.com/apache/skywalking/pull/11558#discussion_r1395690392
##
oap-server/server-starter/src/main/resources/ui-initialized-templates/nginx/nginx-endpoint.json:
##
@@ -0,0 +1,166 @@
+[
+ {
+"id": "nginx-Endpoint",
+"configuration": {
+ "children": [
+{
+ "x": 0,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "0",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Request Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_requests"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "1",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Latency (ms)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_latency"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 16,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "2",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+"meter_nginx_endpoint_http_bandwidth/1024"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "widget": {
+"title": "HTTP Bandwidth (KB)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ }
+},
+{
+ "x": 0,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "3",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Status Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_status"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "4",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+
"(meter_nginx_endpoint_http_4xx_requests_increment/meter_nginx_endpoint_http_requests_increment)*100"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "graph": {
+"type": "Area",
+"opacity": 0.4,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "widget": {
+"title": "HTTP Status 4xx Percent (%)"
Review Comment:
Then the title `HTTP Status 4xx Percent Per Minute (%)` is better?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(skywalking-booster-ui) branch main updated: feat: add Nginx menu i18n (#338)
This is an automated email from the ASF dual-hosted git repository.
qiuxiafan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 8f3ce7d3 feat: add Nginx menu i18n (#338)
8f3ce7d3 is described below
commit 8f3ce7d371b7dd744f564e7d9d7f1dadd548ab7a
Author: weixiang1862 <652048...@qq.com>
AuthorDate: Thu Nov 16 21:23:10 2023 +0800
feat: add Nginx menu i18n (#338)
---
src/locales/lang/menus/en.ts | 2 ++
src/locales/lang/menus/es.ts | 2 ++
src/locales/lang/menus/zh.ts | 2 ++
3 files changed, 6 insertions(+)
diff --git a/src/locales/lang/menus/en.ts b/src/locales/lang/menus/en.ts
index 6b70e681..82d44e4c 100644
--- a/src/locales/lang/menus/en.ts
+++ b/src/locales/lang/menus/en.ts
@@ -82,6 +82,8 @@ const titles = {
gateway: "Gateway",
gateway_desc:
"API gateway is an API management tool that sits between a client and a
collection of backend services.",
+ gateway_nginx: "Nginx",
+ gateway_nginx_desc: "Provide Nginx monitoring through OpenTelemetry's
Prometheus Receiver.",
gateway_apisix: "APISIX",
gateway_apisix_desc: "Provide APISIX monitoring through OpenTelemetry's
Prometheus Receiver.",
gateway_aws_api_gateway: "AWS API Gateway",
diff --git a/src/locales/lang/menus/es.ts b/src/locales/lang/menus/es.ts
index cd02e856..e961d2f0 100644
--- a/src/locales/lang/menus/es.ts
+++ b/src/locales/lang/menus/es.ts
@@ -82,6 +82,8 @@ const titles = {
gateway: "Puerta",
gateway_desc:
"API gateway is an API management tool that sits between a client and a
collection of backend services.",
+ gateway_nginx: "Nginx",
+ gateway_nginx_desc: "Provide Nginx monitoring through OpenTelemetry's
Prometheus Receiver.",
gateway_apisix: "APISIX",
gateway_apisix_desc: "Provide APISIX monitoring through OpenTelemetry's
Prometheus Receiver.",
gateway_aws_api_gateway: "AWS API Gateway",
diff --git a/src/locales/lang/menus/zh.ts b/src/locales/lang/menus/zh.ts
index 65a84cbd..7ef03fed 100644
--- a/src/locales/lang/menus/zh.ts
+++ b/src/locales/lang/menus/zh.ts
@@ -72,6 +72,8 @@ const titles = {
// Gateway
gateway: "网关",
gateway_desc: "API网关是位于客户端和后端服务集合之间的API管理工具。",
+ gateway_nginx: "Nginx",
+ gateway_nginx_desc: "通过OpenTelemetry的Prometheus接收器提供Nginx监控。",
gateway_apisix: "APISIX",
gateway_apisix_desc: "通过OpenTelemetry的Prometheus接收器提供APISIX监控。",
gateway_aws_api_gateway: "AWS API Gateway",
Re: [PR] feat: add Nginx menu i18n [skywalking-booster-ui]
Fine0830 merged PR #338: URL: https://github.com/apache/skywalking-booster-ui/pull/338 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814426708 > error.log has log level, accesslog doesn't. Should I set the default log level for accesslog? Which logs are you gathering from accesslog? The log output should include the level, isn't it? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on code in PR #11558:
URL: https://github.com/apache/skywalking/pull/11558#discussion_r1395684701
##
test/e2e-v2/cases/nginx/e2e.yaml:
##
@@ -0,0 +1,97 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is used to show how to write configuration files and can be used
to test.
+
+setup:
+ env: compose
+ file: docker-compose.yml
+ timeout: 20m
+ init-system-environment: ../../script/env
+ steps:
+- name: set PATH
+ command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
+- name: install yq
+ command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh yq
+- name: install swctl
+ command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh swctl
+
+trigger:
+ action: http
+ interval: 3s
+ times: 10
+ url: http://${nginx_host}:${nginx_8080}/test
+ method: POST
+
+verify:
+ # verify with retry strategy
+ retry:
+# max retry count
+count: 20
+# the interval between two retries, in millisecond.
+interval: 3s
+ cases:
+# service cases
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service ls
+ expected: expected/service.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_nginx_service_http_requests --service-name=nginx::e2e-test | yq e
'to_entries' -
Review Comment:
Ok, thanks.
##
oap-server/server-starter/src/main/resources/ui-initialized-templates/nginx/nginx-endpoint.json:
##
@@ -0,0 +1,166 @@
+[
+ {
+"id": "nginx-Endpoint",
+"configuration": {
+ "children": [
+{
+ "x": 0,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "0",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Request Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_requests"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "1",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Latency (ms)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_latency"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 16,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "2",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+"meter_nginx_endpoint_http_bandwidth/1024"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "widget": {
+"title": "HTTP Bandwidth (KB)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ }
+},
+{
+ "x": 0,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "3",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Status Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_status"
+ ],
+ "metricMode": "Expression",
+
Re: [PR] Support Nginx monitoring. [skywalking]
wankai123 commented on code in PR #11558:
URL: https://github.com/apache/skywalking/pull/11558#discussion_r1395677709
##
oap-server/server-starter/src/main/resources/ui-initialized-templates/nginx/nginx-endpoint.json:
##
@@ -0,0 +1,166 @@
+[
+ {
+"id": "nginx-Endpoint",
+"configuration": {
+ "children": [
+{
+ "x": 0,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "0",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Request Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_requests"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "1",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Latency (ms)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_latency"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 16,
+ "y": 0,
+ "w": 8,
+ "h": 13,
+ "i": "2",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+"meter_nginx_endpoint_http_bandwidth/1024"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "widget": {
+"title": "HTTP Bandwidth (KB)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ }
+},
+{
+ "x": 0,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "3",
+ "type": "Widget",
+ "widget": {
+"title": "HTTP Status Trend (requests per second)"
+ },
+ "graph": {
+"type": "Line",
+"step": false,
+"smooth": false,
+"showSymbol": true,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "expressions": [
+"meter_nginx_endpoint_http_status"
+ ],
+ "metricMode": "Expression",
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ]
+},
+{
+ "x": 8,
+ "y": 13,
+ "w": 8,
+ "h": 13,
+ "i": "4",
+ "type": "Widget",
+ "metricMode": "Expression",
+ "expressions": [
+
"(meter_nginx_endpoint_http_4xx_requests_increment/meter_nginx_endpoint_http_requests_increment)*100"
+ ],
+ "typesOfMQE": [
+"TIME_SERIES_VALUES"
+ ],
+ "graph": {
+"type": "Area",
+"opacity": 0.4,
+"showXAxis": true,
+"showYAxis": true
+ },
+ "widget": {
+"title": "HTTP Status 4xx Percent (%)"
Review Comment:
Is this a Percentage in Per Minute?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wankai123 commented on code in PR #11558:
URL: https://github.com/apache/skywalking/pull/11558#discussion_r1395664984
##
test/e2e-v2/cases/nginx/e2e.yaml:
##
@@ -0,0 +1,97 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file is used to show how to write configuration files and can be used
to test.
+
+setup:
+ env: compose
+ file: docker-compose.yml
+ timeout: 20m
+ init-system-environment: ../../script/env
+ steps:
+- name: set PATH
+ command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
+- name: install yq
+ command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh yq
+- name: install swctl
+ command: bash test/e2e-v2/script/prepare/setup-e2e-shell/install.sh swctl
+
+trigger:
+ action: http
+ interval: 3s
+ times: 10
+ url: http://${nginx_host}:${nginx_8080}/test
+ method: POST
+
+verify:
+ # verify with retry strategy
+ retry:
+# max retry count
+count: 20
+# the interval between two retries, in millisecond.
+interval: 3s
+ cases:
+# service cases
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql service ls
+ expected: expected/service.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_nginx_service_http_requests --service-name=nginx::e2e-test | yq e
'to_entries' -
+ expected: expected/metrics-has-value.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_nginx_service_http_latency --service-name=nginx::e2e-test | yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
+ expected: expected/metrics-has-value-label.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_nginx_service_http_bandwidth --service-name=nginx::e2e-test | yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
+ expected: expected/metrics-has-value-label.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_nginx_service_http_connections --service-name=nginx::e2e-test | yq
e 'to_entries | with(.[] ; .value=(.value | to_entries))' -
+ expected: expected/metrics-has-value-label.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_nginx_service_http_status --service-name=nginx::e2e-test | yq e
'to_entries | with(.[] ; .value=(.value | to_entries))' -
+ expected: expected/metrics-has-value-label.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics linear
--name=meter_nginx_service_http_requests_increment
--service-name=nginx::e2e-test | yq e 'to_entries' -
+ expected: expected/metrics-has-value.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql metrics multiple-linear
--name=meter_nginx_service_error_log_count --service-name=nginx::e2e-test | yq
e 'to_entries | with(.[] ; .value=(.value | to_entries))' -
+ expected: expected/metrics-has-value-label.yml
+- query: swctl --display yaml
--base-url=http://${oap_host}:${oap_12800}/graphql logs list
--service-name=nginx::e2e-test
+ expected: expected/logs.yml
+
Review Comment:
```suggestion
```
##
test/e2e-v2/cases/nginx/docker-compose.yml:
##
@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific
Re: [PR] Support Nginx monitoring. [skywalking]
weixiang1862 commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814421512 > From the screenshot, the log level is absent. error.log has log level, accesslog doesn't. Should I set the default log level for accesslog? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
wu-sheng commented on PR #649: URL: https://github.com/apache/skywalking-java/pull/649#issuecomment-1814386089 I am not sure why, but the UTs on the Windows keep failing. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support Nginx monitoring. [skywalking]
wu-sheng commented on PR #11558: URL: https://github.com/apache/skywalking/pull/11558#issuecomment-1814371677 From the screenshot, the log level is absent. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] db.instance is incorrect in PostgreSQL plugin [skywalking]
wu-sheng commented on issue #11552: URL: https://github.com/apache/skywalking/issues/11552#issuecomment-1814328176 I can see a patch to fix this. https://github.com/apache/skywalking-java/pull/649 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] db.instance is incorrect in PostgreSQL plugin [skywalking]
mitht closed issue #11552: [Bug] db.instance is incorrect in PostgreSQL plugin URL: https://github.com/apache/skywalking/issues/11552 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] db.instance is incorrect in PostgreSQL plugin [skywalking]
mitht commented on issue #11552:
URL: https://github.com/apache/skywalking/issues/11552#issuecomment-1814316637
> 您可以调试一下`PostgreSQLURLParser`，找出原因。
Thank you for your answer
edit:
protected URLLocation fetchDatabaseNameIndexRange() {
String protocol = url.split("//")[0];
String address = url.split("//")[1];
String ip = address.split(":")[0];
String port_db_url = address.split(":")[1];
String port = port_db_url.split("/")[0];
String db_left = protocol + "//" + ip + ":" + port + "/";
return new URLLocation(db_left.length(), url.length());
}
https://github.com/apache/skywalking/assets/29425860/5c698696-5fbe-499e-a521-ff9b5d262910";>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(skywalking) branch abandon deleted (was b21986d9d5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git was b21986d9d5 Update ArrayBlockingQueueBuffer.java The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(skywalking) branch master updated: Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode (#11554)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 257684a0b8 Change the policy of the queue(DataCarrier) L1 in the
metric aggregate worker to IF_POSSIBLE mode (#11554)
257684a0b8 is described below
commit 257684a0b8da98c127c0256fa052e4bc0ada008d
Author: 吴晟 Wu Sheng
AuthorDate: Thu Nov 16 19:50:24 2023 +0800
Change the policy of the queue(DataCarrier) L1 in the metric aggregate
worker to IF_POSSIBLE mode (#11554)
---
docs/en/changes/changes.md | 3 +
.../analysis/worker/MetricsAggregateWorker.java| 13 +++-
.../buffer/ArrayBlockingQueueBuffer.java | 4 +-
.../server/library/datacarrier/buffer/Buffer.java | 76 --
.../library/datacarrier/buffer/Channels.java | 6 +-
.../datacarrier/consumer/ConsumerThread.java | 4 --
6 files changed, 18 insertions(+), 88 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 5c360c2e14..bef119bce2 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -39,6 +39,9 @@
* Fix `limit` doesn't work for `findEndpoint` API in ES storage.
* Isolate MAL CounterWindow cache by metric name.
* Fix JDBC Log query order.
+* Change the DataCarrier IF_POSSIBLE strategy to use ArrayBlockingQueue
implementation.
+* Change the policy of the queue(DataCarrier) in the L1 metric aggregate
worker to IF_POSSIBLE mode.
+* Add self-observability metric `metrics_aggregator_abandon` to count the
number of abandon metrics.
UI
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
index 698341144f..255aa44306 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsAggregateWorker.java
@@ -25,6 +25,7 @@ import
org.apache.skywalking.oap.server.core.analysis.data.MergableBufferedData;
import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
import org.apache.skywalking.oap.server.library.datacarrier.DataCarrier;
+import
org.apache.skywalking.oap.server.library.datacarrier.buffer.BufferStrategy;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.BulkConsumePool;
import
org.apache.skywalking.oap.server.library.datacarrier.consumer.ConsumerPoolFactory;
import org.apache.skywalking.oap.server.library.datacarrier.consumer.IConsumer;
@@ -46,6 +47,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
private AbstractWorker nextWorker;
private final DataCarrier dataCarrier;
private final MergableBufferedData mergeDataCache;
+private CounterMetrics abandonCounter;
private CounterMetrics aggregationCounter;
private long lastSendTime = 0;
@@ -68,7 +70,7 @@ public class MetricsAggregateWorker extends
AbstractWorker {
queueBufferSize = 1_000;
}
this.dataCarrier = new DataCarrier<>(
-"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize);
+"MetricsAggregateWorker." + modelName, name, queueChannelSize,
queueBufferSize, BufferStrategy.IF_POSSIBLE);
BulkConsumePool.Creator creator = new BulkConsumePool.Creator(
name, BulkConsumePool.Creator.recommendMaxSize() * 2, 20);
@@ -82,6 +84,11 @@ public class MetricsAggregateWorker extends
AbstractWorker {
MetricsCreator metricsCreator =
moduleDefineHolder.find(TelemetryModule.NAME)
.provider()
.getService(MetricsCreator.class);
+abandonCounter = metricsCreator.createCounter(
+"metrics_aggregator_abandon", "The abandon number of rows received
in aggregation",
+new MetricsTag.Keys("metricName", "level", "dimensionality"),
+new MetricsTag.Values(modelName, "1", "minute")
+);
aggregationCounter = metricsCreator.createCounter(
"metrics_aggregation", "The number of rows in aggregation",
new MetricsTag.Keys("metricName", "level", "dimensionality"),
@@ -95,7 +102,9 @@ public class MetricsAggregateWorker extends
AbstractWorker {
*/
@Override
public final void in(Metrics metrics) {
-dataCarrier.produce(metrics);
+if (!dataCarrier.produce(metrics)) {
+abandonCounter.inc();
+}
}
/**
diff --git
a/oap-server/server-library/librar
Re: [PR] Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode [skywalking]
wu-sheng merged PR #11554: URL: https://github.com/apache/skywalking/pull/11554 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Fix PostgreSQL Jdbc URL parsing exception [skywalking-java]
CzyerChen opened a new pull request, #649: URL: https://github.com/apache/skywalking-java/pull/649 ### Fix #11552 - [x] Add a unit test to verify that the fix works. - [x] Explain briefly why the bug exists and how to fix it. ### Fix multi hosts JDBC url parsing exception - [x] Add a unit test to verify that the fix works. - [x] Explain briefly why the bug exists and how to fix it. - [x] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #11552. - [x] Update the [`CHANGES` log](https://github.com/apache/skywalking-java/blob/main/CHANGES.md). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] feat: add Nginx menu i18n [skywalking-booster-ui]
weixiang1862 opened a new pull request, #338: URL: https://github.com/apache/skywalking-booster-ui/pull/338 for https://github.com/apache/skywalking/issues/11534 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Support Nginx monitoring. [skywalking]
weixiang1862 opened a new pull request, #11558: URL: https://github.com/apache/skywalking/pull/11558 ### Nginx monitoring - [ ] If this is non-trivial feature, paste the links/URLs to the design doc. - [x] Update the documentation to include this new feature. - [x] Tests(including UT, IT, E2E) are added to verify the new feature. - [x] If it's UI related, attach the screenshots below. - [x] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #11534. - [x] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/changes.md).     -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(skywalking) branch abandon updated (b61b7a80f0 -> b21986d9d5)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch abandon in repository https://gitbox.apache.org/repos/asf/skywalking.git from b61b7a80f0 Fix words. add b21986d9d5 Update ArrayBlockingQueueBuffer.java No new revisions were added by this update. Summary of changes: .../server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Re: [PR] Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode [skywalking]
kezhenxu94 commented on code in PR #11554:
URL: https://github.com/apache/skywalking/pull/11554#discussion_r1395468451
##
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java:
##
@@ -40,8 +40,10 @@ public class ArrayBlockingQueueBuffer implements
QueueBuffer {
@Override
public boolean save(T data) {
-//only BufferStrategy.BLOCKING
try {
+if (BufferStrategy.IF_POSSIBLE.equals(strategy) &&
queue.remainingCapacity() == 0) {
+return false;
+}
Review Comment:
For the edge cases, (1) if the queue is not full but
`queue.remainingCapacity() == 0`, we drop some data that should not have been
dropped, this is not a big deal, it doesn't worsen the case, but, (2) if the
queue is full but `queue.remainingCapacity() != 0`, `queue.remainingCapacity()`
itself needs to acquire a lock and then `queue.put()` also needs the same
again, AND `queue.put` is blocking, this worsen the edge case where the queue
is already full.
I think we can leverage the `offer` method to reduce acquisition of locks
and avoid unnecessary blocking
```suggestion
if (BufferStrategy.IF_POSSIBLE.equals(strategy)) {
return queue.offer(data);
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [I] Suspect that the service is using Skywalk-agent causing memory inflation [skywalking]
wu-sheng commented on issue #11557: URL: https://github.com/apache/skywalking/issues/11557#issuecomment-1814142234 What you posted doesn't help in any case. We don't have magic. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode [skywalking]
wu-sheng commented on code in PR #11554:
URL: https://github.com/apache/skywalking/pull/11554#discussion_r1395449913
##
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java:
##
@@ -40,8 +40,10 @@ public class ArrayBlockingQueueBuffer implements
QueueBuffer {
@Override
public boolean save(T data) {
-//only BufferStrategy.BLOCKING
try {
+if (BufferStrategy.IF_POSSIBLE.equals(strategy) &&
queue.remainingCapacity() == 0) {
+return false;
+}
Review Comment:
For the edge case, I think we don't need to be accurate. Because accurate
means more blocks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode [skywalking]
wu-sheng commented on code in PR #11554:
URL: https://github.com/apache/skywalking/pull/11554#discussion_r1395448993
##
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java:
##
@@ -40,8 +40,10 @@ public class ArrayBlockingQueueBuffer implements
QueueBuffer {
@Override
public boolean save(T data) {
-//only BufferStrategy.BLOCKING
try {
+if (BufferStrategy.IF_POSSIBLE.equals(strategy) &&
queue.remainingCapacity() == 0) {
+return false;
+}
Review Comment:
Because the ArrayBlockingQueueBuffer has better performance from x-thread
visibility side. We have tested and proved that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Change the policy of the queue(DataCarrier) L1 in the metric aggregate worker to IF_POSSIBLE mode [skywalking]
kezhenxu94 commented on code in PR #11554:
URL: https://github.com/apache/skywalking/pull/11554#discussion_r1395437537
##
oap-server/server-library/library-datacarrier-queue/src/main/java/org/apache/skywalking/oap/server/library/datacarrier/buffer/ArrayBlockingQueueBuffer.java:
##
@@ -40,8 +40,10 @@ public class ArrayBlockingQueueBuffer implements
QueueBuffer {
@Override
public boolean save(T data) {
-//only BufferStrategy.BLOCKING
try {
+if (BufferStrategy.IF_POSSIBLE.equals(strategy) &&
queue.remainingCapacity() == 0) {
+return false;
+}
Review Comment:
From the javadoc of `queue.remainingCapacity`, this is a misuse
```
* Note that you cannot always tell if an attempt to insert
* an element will succeed by inspecting {@code remainingCapacity}
* because it may be the case that another thread is about to
* insert or remove an element.
```
And I'm curious why don't we remove `ArrayBlockingQueueBuffer.java` and keep
`Buffer.java`, I personally think the `Buffer` class is more easy to read.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[I] Suspect that the service is using Skywalk-agent causing memory inflation [skywalking]
xiaoyuwang1987 opened a new issue, #11557: URL: https://github.com/apache/skywalking/issues/11557 ### Search before asking - [X] I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar issues. ### Apache SkyWalking Component Java Agent (apache/skywalking-java) ### What happened Project joined Skywalk-agent found very eat memory？ Looking at the memory address, there is a 1.5G jar loaded with a lot of agents is jar ### What you expected to happen Whether the loaded skywalking-agent.jar can be reduced ### How to reproduce thank you ### Anything else _No response_ ### Are you willing to submit a pull request to fix on your own? - [X] Yes I am willing to submit a pull request on my own! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
