Unverified Commit b363b0ea authored by songzhendong's avatar songzhendong Committed by GitHub
Browse files

Add Nacos back into SkyWalking as an option(nacos-1.3.1) (#5137)

parent 20b1b517

dist-material/release-docs/LICENSE

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ The text of each license is the standard Apache 2.0 license. 
    kubernetes-client 8.0.0: https://github.com/kubernetes-client/java, Apache 2.0

    proto files from istio/istio: https://github.com/istio/istio  Apache 2.0

    proto files from istio/api: https://github.com/istio/api      Apache 2.0

    nacos 1.3.1: https://github.com/alibaba/nacos, Apache 2.0

    consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0

    okhttp 3.9.0: https://github.com/square/okhttp, Apache 2.0

    prometheus client_java 0.6.0: https://github.com/prometheus/client_java, Apache 2.0

docs/en/setup/backend/backend-cluster.md

+10 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ with each other. 
by using k8s native APIs to manage cluster.

- [Consul](#consul). Use Consul as backend cluster management implementor, to coordinate backend instances.

- [Etcd](#etcd). Use Etcd to coordinate backend instances.



- [Nacos](#nacos). Use Nacos to coordinate backend instances.

In the `application.yml`, there're default configurations for the aforementioned coordinators under the section `cluster`,

you can specify one of them in the `selector` property to enable it.
@@ -91,3 +91,12 @@ cluster: 
  selector: ${SW_CLUSTER:etcd}

  # other configurations

```



## Nacos

Set the **cluster/selector** to **nacos** in the yml to enable.



```yaml

cluster:

  selector: ${SW_CLUSTER:nacos}

  # other configurations

```
 
 No newline at end of file

docs/en/setup/backend/dynamic-config.md

+21 −0
Original line number Diff line number Diff line
@@ -120,3 +120,24 @@ configuration: 
      # Labelselector is used to locate specific configmap

      labelSelector: ${SW_CLUSTER_K8S_LABEL:app=collector,release=skywalking}

```

## Dynamic Configuration Nacos Implementation



[Nacos](https://github.com/alibaba/nacos) is also supported as DCC(Dynamic Configuration Center), to use it, please configure as follows:



```yaml

configuration:

  selector: ${SW_CONFIGURATION:nacos}

  nacos:

    # Nacos Server Host

    serverAddr: ${SW_CONFIG_NACOS_SERVER_ADDR:127.0.0.1}

    # Nacos Server Port

    port: ${SW_CONFIG_NACOS_SERVER_PORT:8848}

    # Nacos Configuration Group

    group: ${SW_CONFIG_NACOS_SERVER_GROUP:skywalking}

    # Nacos Configuration namespace

    namespace: ${SW_CONFIG_NACOS_SERVER_NAMESPACE:}

    # Unit seconds, sync period. Default fetch every 60 seconds.

    period: ${SW_CONFIG_NACOS_PERIOD:60}

    # the name of current cluster, set the name if you want to upstream system known.

    clusterName: ${SW_CONFIG_NACOS_CLUSTER_NAME:default}

```
 
 No newline at end of file

oap-server/pom.xml

+6 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
        <commons-text.version>1.4</commons-text.version>

        <simpleclient.version>0.6.0</simpleclient.version>

        <apollo.version>1.4.0</apollo.version>

        <nacos.version>1.3.1</nacos.version>

        <maven-docker-plugin.version>0.30.0</maven-docker-plugin.version>

        <curator.version>4.0.1</curator.version>

        <curator-test.version>2.12.0</curator-test.version>
@@ -379,13 +380,16 @@ 
                <artifactId>simpleclient</artifactId>

                <version>${simpleclient.version}</version>

            </dependency>



            <dependency>

                <groupId>com.ctrip.framework.apollo</groupId>

                <artifactId>apollo-client</artifactId>

                <version>${apollo.version}</version>

            </dependency>



            <dependency>

                <groupId>com.alibaba.nacos</groupId>

                <artifactId>nacos-client</artifactId>

                <version>${nacos.version}</version>

            </dependency>

            <dependency>

                <groupId>org.mousio</groupId>

                <artifactId>etcd4j</artifactId>

oap-server/server-bootstrap/pom.xml

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ 
            <artifactId>cluster-etcd-plugin</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.apache.skywalking</groupId>

            <artifactId>cluster-nacos-plugin</artifactId>

            <version>${project.version}</version>

        </dependency>

        <!-- cluster module -->



        <!-- receiver module -->
@@ -200,6 +205,11 @@ 
            <artifactId>configuration-k8s-configmap</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.apache.skywalking</groupId>

            <artifactId>configuration-nacos</artifactId>

            <version>${project.version}</version>

        </dependency>

    </dependencies>



    <build>