Skip to content

Commit

Permalink
Merge pull request #299 from observeralone/release-2.2.4
Browse files Browse the repository at this point in the history
feat: release 2.2.4
  • Loading branch information
landyking authored Nov 29, 2022
2 parents 9ce54df + e0aae69 commit b08295c
Show file tree
Hide file tree
Showing 43 changed files with 99 additions and 48 deletions.
2 changes: 1 addition & 1 deletion build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion context/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
55 changes: 55 additions & 0 deletions doc/how-to-use/megacloud-config.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
### First: Download and install the agent
[see our doc](https://github.com/megaease/easeagent#get-and-set-environment-variable)

### Second: Configuration
Modify the agent.properties file to configure your information.

##### 1. name

You'll name to find your data later. It's important to use a unique and meaningful name.

The service name of megacloud consists of three parts: zone, domain, name. They are joined by `.` into `ServiceName`

```properties
name=zone.domain.service
```

##### 2. MTLS

MTLS is a secure authentication protocol for EaseAgent to connect to MegaCloud.

Config: Get TLS
```properties
reporter.outputServer.tls.enable=true
reporter.outputServer.tls.key=YOUR_TLS_KEY
reporter.outputServer.tls.cert=YOUR_TLS_CERT
```

##### 3. reporter

MegaCloud uses http to receive data, so you need to change the configuration to http and MegaCloud's address.
```properties
reporter.outputServer.bootstrapServer={MEGA_CLOUD_URL}
reporter.outputServer.appendType=http
reporter.tracing.sender.appendType=http
reporter.metric.sender.appendType=http
plugin.observability.global.metric.url=/platform-metrics
plugin.observability.global.log.url=/application-log
plugin.observability.access.log.url=/application-access-log
reporter.tracing.sender.url=/application-tracing-log
reporter.tracing.encoder=SpanJsonEncoder
```

##### 4. other
Other configurations are EaseAgent related configurations such as Tracing, Metric, etc. For details, please refer to [github doc](https://github.com/megaease/easeagent/blob/master/doc/user-manual.md#configuration)

### Third: About `MEGA_CLOUD_URL` And `TLS`

When you download the `easeagent.jar` file through our megacloud, `MEGA_CLOUD_URL` and `TLS` will be filled in for you automatically.

If you need it separately, please download the `easeagent.jar` and get it by yourself.

You can use the command to get config:
```bash
jar xf easeagent.jar agent.properties
```
2 changes: 1 addition & 1 deletion httpserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion log4j2/log4j2-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>log4j2</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion log4j2/log4j2-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>log4j2</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion log4j2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion metrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/config-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/context-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/log4j2-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/metrics-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/plugin-api-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/report-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/utils-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion mock/zipkin-mock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>mock</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugin-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<artifactId>plugin-api</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion plugins/async/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<!--
Expand Down
2 changes: 1 addition & 1 deletion plugins/dubbo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/healthy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/httpclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/httpservlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<!--
Expand Down
2 changes: 1 addition & 1 deletion plugins/kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/log4j2-log-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<!--
Expand Down
2 changes: 1 addition & 1 deletion plugins/logback/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<!--
Expand Down
2 changes: 1 addition & 1 deletion plugins/mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/motan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion plugins/okhttp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>plugins</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
10 changes: 3 additions & 7 deletions plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<parent>
<artifactId>easeagent</artifactId>
<groupId>com.megaease.easeagent</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
<packaging>pom</packaging>
<name>easeagent-plugins</name>

Expand All @@ -53,16 +53,12 @@
<module>motan</module>
</modules>

<properties>
<version.easeagent>2.2.3</version.easeagent>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugin-api</artifactId>
<version>${version.easeagent}</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion plugins/rabbitmq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.megaease.easeagent</groupId>
<artifactId>plugins</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>

<!--
Expand Down
Loading

0 comments on commit b08295c

Please sign in to comment.