Re: [PR] [WIP] Add a getting started doc for swck [skywalking-swck]
dashanji commented on PR #100: URL: https://github.com/apache/skywalking-swck/pull/100#issuecomment-1817755111 @hanahmily I have addressed these comments. Could you please take another review? -- 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] [WIP] Add a getting started doc for swck [skywalking-swck]
dashanji commented on code in PR #100: URL: https://github.com/apache/skywalking-swck/pull/100#discussion_r1398327613 ## docs/getting-started.md: ## @@ -0,0 +1,316 @@ +## Getting Started + +This document introduces how to create a kubernetes cluster locally using kind and how to deploy the basic skywalking components to the cluster. + +### Prerequisites +- [docker](https://docs.docker.com/get-docker/) +- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) +- [kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) +- [swctl](https://github.com/apache/skywalking-cli?tab=readme-ov-file#install) + +### Step1: Create a kubernetes cluster locally using kind + +> Note: If you have a kubernetes cluster already, you can skip this step. Review Comment: Updated. It should be more than v1.21.10 -- 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-swck) branch add-getting-started-doc deleted (was 1ddff01)
This is an automated email from the ASF dual-hosted git repository. dashanji pushed a change to branch add-getting-started-doc in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git was 1ddff01 Add the labels for javaagent and improve the getting started doc. This change permanently discards the following revisions: discard 1ddff01 Add the labels for javaagent and improve the getting started doc. discard 4c43a7a Fix the bug that javaAgent configurations is incomplete.
(skywalking-swck) 01/02: Fix the bug that javaAgent configurations is incomplete.
This is an automated email from the ASF dual-hosted git repository. dashanji pushed a commit to branch add-getting-started-doc in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git commit 4c43a7a328b3016552f6acad49d4caa5caf27d01 Author: dashanji AuthorDate: Sun Nov 19 13:01:22 2023 +0800 Fix the bug that javaAgent configurations is incomplete. Signed-off-by: dashanji --- operator/controllers/operator/javaagent_controller.go | 1 + 1 file changed, 1 insertion(+) diff --git a/operator/controllers/operator/javaagent_controller.go b/operator/controllers/operator/javaagent_controller.go index b4a937e..e679c33 100644 --- a/operator/controllers/operator/javaagent_controller.go +++ b/operator/controllers/operator/javaagent_controller.go @@ -98,6 +98,7 @@ func (r *JavaAgentReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( } config := map[string]string{} r.injectConfigBySwAgent(lastMatchedSwAgent, config) + injector.GetInjectedAgentConfig(&pod.Annotations, &config) // only get the first selector label from labels as podselector labels := pod.Labels
(skywalking-swck) 02/02: Add the labels for javaagent and improve the getting started doc.
This is an automated email from the ASF dual-hosted git repository. dashanji pushed a commit to branch add-getting-started-doc in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git commit 1ddff01a3732f3c6862e44609d67de074284632b Author: dashanji AuthorDate: Sun Nov 19 13:38:13 2023 +0800 Add the labels for javaagent and improve the getting started doc. Signed-off-by: dashanji --- docs/getting-started.md| 63 -- .../controllers/operator/javaagent_controller.go | 6 +++ .../manifests/injector/templates/javaagent.yaml| 2 + 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/docs/getting-started.md b/docs/getting-started.md index dba14b6..ae4bd86 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -3,10 +3,10 @@ This document introduces how to create a kubernetes cluster locally using kind and how to deploy the basic skywalking components to the cluster. ### Prerequisites -- [docker](https://docs.docker.com/get-docker/) -- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) -- [kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) -- [swctl](https://github.com/apache/skywalking-cli?tab=readme-ov-file#install) +- [docker](https://docs.docker.com/get-docker/) >= v20.10.6 +- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) >= v1.21.0 +- [kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) >= v0.20.0 +- [swctl](https://github.com/apache/skywalking-cli?tab=readme-ov-file#install) >= v0.10.0 ### Step1: Create a kubernetes cluster locally using kind @@ -282,6 +282,61 @@ $ kubectl get pod -n skywalking-system -l app=demo -ojsonpath='{.items[0].spec.i ``` +Also, you could check the final java agent configurations with the following command. + +```shell +$ kubectl get javaagent -n skywalking-system -l app=demo -oyaml +``` + + + Expected output + +```shell +apiVersion: v1 +items: +- apiVersion: operator.skywalking.apache.org/v1alpha1 + kind: JavaAgent + metadata: +creationTimestamp: "2023-11-19T05:34:03Z" +generation: 1 +labels: + app: demo +name: app-demo-javaagent +namespace: skywalking-system +ownerReferences: +- apiVersion: apps/v1 + blockOwnerDeletion: true + controller: true + kind: ReplicaSet + name: demo-75d8d995cc + uid: 8cb64abc-9b50-4f67-9304-2e09de476168 +resourceVersion: "21515" +uid: 6cbafb3d-9f43-4448-95e8-bda1f7c72bc3 + spec: +agentConfiguration: + collector.backend_service: skywalking-system-oap.skywalking-system:11800 + optional-plugin: webflux|cloud-gateway-2.1.x +backendService: skywalking-system-oap.skywalking-system:11800 +podSelector: app=demo +serviceName: Your_ApplicationName + status: +creationTime: "2023-11-19T05:34:03Z" +expectedInjectiedNum: 1 +lastUpdateTime: "2023-11-19T05:34:46Z" +realInjectedNum: 1 +kind: List +metadata: + resourceVersion: "" + selfLink: "" +``` + + +If you want to check the logs of the java agent, you can run the following command. + +```shell +$ kubectl logs -f -n skywalking-system -l app=demo -c inject-skywalking-agent +``` + ### Step6: Check the application metrics in the skywalking UI diff --git a/operator/controllers/operator/javaagent_controller.go b/operator/controllers/operator/javaagent_controller.go index e679c33..7fbd43d 100644 --- a/operator/controllers/operator/javaagent_controller.go +++ b/operator/controllers/operator/javaagent_controller.go @@ -125,6 +125,12 @@ func (r *JavaAgentReconciler) Reconcile(ctx context.Context, req ctrl.Request) ( "config": func() map[string]string { return config }, + "labelKey": func() string { + return keys[0] + }, + "labelValue": func() string { + return labels[keys[0]] + }, "ownerReference": func() metav1.OwnerReference { return ownerReference }, diff --git a/operator/pkg/operator/manifests/injector/templates/javaagent.yaml b/operator/pkg/operator/manifests/injector/templates/javaagent.yaml index db8b455..b516a27 100644 --- a/operator/pkg/operator/manifests/injector/templates/javaagent.yaml +++ b/operator/pkg/operator/manifests/injector/templates/javaagent.yaml @@ -21,6 +21,8 @@ kind: JavaAgent metadata: name: {{SelectorName}}-javaagent namespace: {{Namespace}} + labels: +{{labelKey}}: {{labelValue}} ownerReferences: - apiVersion: {{ownerReference.APIVersion}} blockOwnerDeletion: {{ownerReference.BlockOwnerDeletion}}
(skywalking-swck) branch add-getting-started-doc created (now 1ddff01)
This is an automated email from the ASF dual-hosted git repository. dashanji pushed a change to branch add-getting-started-doc in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git at 1ddff01 Add the labels for javaagent and improve the getting started doc. This branch includes the following new commits: new 4c43a7a Fix the bug that javaAgent configurations is incomplete. new 1ddff01 Add the labels for javaagent and improve the getting started doc. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) branch sync deleted (was fe6143b960)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git was fe6143b960 Sync UI 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: Sync UI - fix: change log widget and loading mask style (#11564)
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 a970143386 Sync UI - fix: change log widget and loading mask style (#11564) a970143386 is described below commit a970143386c748891b03d430376754dae961bcc7 Author: 吴晟 Wu Sheng AuthorDate: Sun Nov 19 08:26:19 2023 +0800 Sync UI - fix: change log widget and loading mask style (#11564) --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index c6d1c49569..02c5724859 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b +Subproject commit 02c572485967a8ee41cb63d649d5141e9ca5e721
Re: [PR] Sync UI - fix: change log widget and loading mask style [skywalking]
wu-sheng merged PR #11564: URL: https://github.com/apache/skywalking/pull/11564 -- 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 - fix: change log widget and loading mask style [skywalking]
wu-sheng opened a new pull request, #11564: URL: https://github.com/apache/skywalking/pull/11564 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [ ] 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 sync created (now fe6143b960)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git at fe6143b960 Sync UI This branch includes the following new commits: new fe6143b960 Sync UI The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: Sync UI
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sync in repository https://gitbox.apache.org/repos/asf/skywalking.git commit fe6143b9600d062340847a06527fe73e9a1cf75b Author: Wu Sheng AuthorDate: Sun Nov 19 08:17:14 2023 +0800 Sync UI --- skywalking-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-ui b/skywalking-ui index c6d1c49569..02c5724859 16 --- a/skywalking-ui +++ b/skywalking-ui @@ -1 +1 @@ -Subproject commit c6d1c495699c2f55cd9abe79233b802c69454a5b +Subproject commit 02c572485967a8ee41cb63d649d5141e9ca5e721
Re: [I] table: alarm_record does not exist. OAP is running in 'no-init' mode, waiting... retry 3s later. [skywalking]
JangGyeongSik commented on issue #4938: URL: https://github.com/apache/skywalking/issues/4938#issuecomment-1817557775 I had the same problem, but it was solved thanks to @anantvardhan04 Thanks for the good information :) -- 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