[PR] Fix docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


CodePrometheus opened a new pull request, #167:
URL: https://github.com/apache/skywalking-showcase/pull/167

   ### Summary
   
   - Fix previous docker configuration mistakes
   - Update 
[oap](https://github.com/apache/skywalking/tree/48c96a233103ba869143062923d4033678b91f73)
 and 
[ui](https://github.com/apache/skywalking-booster-ui/tree/8bc67614681b37623fa64233f8389d6754e64cf2)


-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


kezhenxu94 commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554761804


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   This is absolutely wrong as it set both cluster and single-node, which 
indicate OAP runs in cluster mode and single node mode, which is conflict 



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


kezhenxu94 commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554761804


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   This is absolutely wrong as it sets both cluster and single-node, which 
indicate OAP runs in cluster mode and single node mode, which is conflict 



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554800652


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   I think we could set `make deploy.docker FEATURE_FLAGS=cluster,...` or `make 
deploy.docker FEATURE_FLAGS=single-node,...`



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554801593


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   I think we should consider to limit default deployment and keep one per kind 
only.
   Otherwise, even currently, most people don't have enough local resources to 
support 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



Re: [PR] Fix docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554801708


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   Keep pulsar or Kafka as MQ default should be good, and MySQL as default DB 
showcase.



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554805626


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   It's good, but my idea is that we could all declare it in `FEATURE_FLAGS` 
and let users choose the required components. I can add the document later 
https://skywalking.apache.org/docs/skywalking-showcase/next/readme/#docker-compose,
 how about this way



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554805833


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   Isn't feature flag provided in the docs already?



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554808012


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   Yep, the feature flags for different platforms description is already there, 
could we align it with the way of kubernetes deploy



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554808423


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   Do you mean align k8s and docker compose deployment? Aren't they aligned? Or 
do you mean yo align default deployment only?
   
   I am not following.



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


kezhenxu94 commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554809846


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   > I think we could set `make deploy.docker FEATURE_FLAGS=cluster,...` or 
`make deploy.docker FEATURE_FLAGS=single-node,...`
   
   The FEATURE_FLAGS in the Makefile is not a doc, it serves as the default 
value, so users don't need to set the flags every time and it makes sense for 
new users to quick start. 



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-06 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1554812011


##
deploy/platform/docker/Makefile.in:
##
@@ -17,4 +17,4 @@
 #
 
 .EXPORT_ALL_VARIABLES:
-FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor
+FEATURE_FLAGS ?= 
agent,cluster,so11y,vm-monitor,event,mysql-monitor,nginx-monitor,apisix-monitor,grafana,elasticsearch-monitor,pulsar-monitor,rocketmq-monitor,mongodb-monitor,rabbitmq-monitor,postgresql-monitor,satellite,single-node

Review Comment:
   Right, I got what the two teachers said. I mean align default deployment 
before. I will fix it later, revert it is ok I think.



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-07 Thread via GitHub


wu-sheng merged PR #167:
URL: https://github.com/apache/skywalking-showcase/pull/167


-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-08 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1555418336


##
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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2

Review Comment:
   You are putting a wrong commit ID. The UI image is packaged in the main 
repository, not UI.
   
   And you should verify this locally.



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-08 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1555418807


##
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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2

Review Comment:
   This is dev stage image repo, 
https://github.com/apache/skywalking/pkgs/container/skywalking%2Fui



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-08 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r113183


##
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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2

Review Comment:
   OMG I made a stupid mistake, could we postpone the deployment? I'll fix it 
later



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-08 Thread via GitHub


wu-sheng commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r122505


##
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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2

Review Comment:
   We have fixed this manually



-- 
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 docker configurations and bump up images [skywalking-showcase]

2024-04-08 Thread via GitHub


CodePrometheus commented on code in PR #167:
URL: 
https://github.com/apache/skywalking-showcase/pull/167#discussion_r1555618861


##
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 ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_OAP_IMAGE_TAG ?= 48c96a233103ba869143062923d4033678b91f73
 
 SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= 8fad0cc8a822a3b266e528b30295e1376b956f1d
+SW_UI_IMAGE_TAG ?= 8bc67614681b37623fa64233f8389d6754e64cf2

Review Comment:
   Thank you for your trouble, I'll pay more attention in the future.



-- 
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