You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by qi...@apache.org on 2023/05/12 01:50:18 UTC

[skywalking-grafana-plugins] branch main updated: Add a NOTICE as Grafana itself is AGPL licensed (#5)

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-grafana-plugins.git


The following commit(s) were added to refs/heads/main by this push:
     new 56c4439  Add a NOTICE as Grafana itself is AGPL licensed (#5)
56c4439 is described below

commit 56c44399d2d07da52078bae3bd1f8d7f7a9bca82
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri May 12 09:50:13 2023 +0800

    Add a NOTICE as Grafana itself is AGPL licensed (#5)
---
 .asf.yaml          | 3 ++-
 .config/Dockerfile | 4 ++--
 README.md          | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 1912c3c..66180cc 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -16,13 +16,14 @@
 #
 
 github:
-  description: SkyWalking Grafana Plugins provides an extention to visualize telemetry data on Grafana.
+  description: SkyWalking Grafana Plugins provide extentions for Apache SkyWalking visualizting telemetry data on Grafana.
   homepage: https://skywalking.apache.org/
   labels:
     - skywalking
     - observability
     - apm
     - visualization
+    - grafana
   enabled_merge_buttons:
     squash:  true
     merge:   false
diff --git a/.config/Dockerfile b/.config/Dockerfile
index 35d89bd..074b92b 100644
--- a/.config/Dockerfile
+++ b/.config/Dockerfile
@@ -1,5 +1,5 @@
 ARG grafana_version=latest
-ARG grafana_image=grafana-enterprise
+ARG grafana_image=grafana-oss
 
 FROM grafana/${grafana_image}:${grafana_version}
 
@@ -13,4 +13,4 @@ ENV GF_DEFAULT_APP_MODE "development"
 
 # Inject livereload script into grafana index.html
 USER root
-RUN sed -i 's/<\/body><\/html>/<script src=\"http:\/\/localhost:35729\/livereload.js\"><\/script><\/body><\/html>/g' /usr/share/grafana/public/views/index.html
\ No newline at end of file
+RUN sed -i 's/<\/body><\/html>/<script src=\"http:\/\/localhost:35729\/livereload.js\"><\/script><\/body><\/html>/g' /usr/share/grafana/public/views/index.html
diff --git a/README.md b/README.md
index 9fc96cc..c8e70b1 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,9 @@ The Settings tab of the data source is displayed.
 * [bilibili B站 视频](https://space.bilibili.com/390683219)
 
 # License
-[Apache 2.0 License.](LICENSE)
+[Apache 2.0 License.](LICENSE).
+
+**NOTICE, Grafana itself is licensed in [GNU Affero General Public License v3.0](https://github.com/grafana/grafana/blob/v9.5.1/LICENSE).**
 
 ____
 ## Build the plugin from the source codes and run locally