You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ch...@apache.org on 2021/05/23 14:35:36 UTC
[apisix-dashboard] branch release/2.7 created (now f9ecc29)
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a change to branch release/2.7
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.
at f9ecc29 docs: add CHANGELOG for version 2.7
This branch includes the following new commits:
new cf5a1d4 chore: update version no
new e05aa2f ci: run backend e2e with APISIX 2.6
new f9ecc29 docs: add CHANGELOG for version 2.7
The 3 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.
[apisix-dashboard] 02/03: ci: run backend e2e with APISIX 2.6
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a commit to branch release/2.7
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit e05aa2f01dc7d4683d926f035bddaed6b8fef6fe
Author: nic-chen <jo...@163.com>
AuthorDate: Sun May 23 22:33:45 2021 +0800
ci: run backend e2e with APISIX 2.6
---
api/test/docker/apisix_config.yaml | 7 ++++++-
api/test/docker/docker-compose.yaml | 13 +++++++++++--
api/test/e2enew/base/base.go | 6 ++++++
api/test/e2enew/route/route_with_plugin_prometheus_test.go | 6 +++---
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/api/test/docker/apisix_config.yaml b/api/test/docker/apisix_config.yaml
index e56a74d..ab26eaf 100644
--- a/api/test/docker/apisix_config.yaml
+++ b/api/test/docker/apisix_config.yaml
@@ -96,7 +96,12 @@ plugin_attr:
service_name: APISIX
service_instance_name: "APISIX Instance Name"
endpoint_addr: http://172.16.238.50:12800
-
server-info:
report_interval: 60
report_ttl: 3600
+ prometheus:
+ export_uri: /apisix/prometheus/metrics
+ enable_export_server: true
+ export_addr:
+ ip: "0.0.0.0"
+ port: 9091
diff --git a/api/test/docker/docker-compose.yaml b/api/test/docker/docker-compose.yaml
index 2da0990..e8941c5 100644
--- a/api/test/docker/docker-compose.yaml
+++ b/api/test/docker/docker-compose.yaml
@@ -127,7 +127,11 @@ services:
apisix:
hostname: apisix_server1
- image: apache/apisix:2.5-alpine
+ build:
+ context: ../../
+ dockerfile: test/docker/Dockerfile-apisix
+ args:
+ - APISIX_VERSION=master
restart: always
volumes:
- ./apisix_config.yaml:/usr/local/apisix/conf/config.yaml:ro
@@ -141,6 +145,7 @@ services:
ports:
- '9080:9080/tcp'
- '9090:9090/tcp'
+ - '9091:9091/tcp'
- '9443:9443/tcp'
networks:
apisix_dashboard_e2e:
@@ -148,7 +153,11 @@ services:
apisix2:
hostname: apisix_server2
- image: apache/apisix:2.5-alpine
+ build:
+ context: ../../
+ dockerfile: test/docker/Dockerfile-apisix
+ args:
+ - APISIX_VERSION=master
restart: always
volumes:
- ./apisix_config2.yaml:/usr/local/apisix/conf/config.yaml:ro
diff --git a/api/test/e2enew/base/base.go b/api/test/e2enew/base/base.go
index 60fbcaa..32253ff 100644
--- a/api/test/e2enew/base/base.go
+++ b/api/test/e2enew/base/base.go
@@ -41,6 +41,7 @@ var (
APISIXInternalUrl = "http://172.16.238.30:9080"
APISIXSingleWorkerHost = "http://127.0.0.1:9081"
ManagerAPIHost = "http://127.0.0.1:9000"
+ PrometheusExporter = "http://127.0.0.1:9091"
)
func GetToken() string {
@@ -79,6 +80,11 @@ func APISIXExpect() *httpexpect.Expect {
return httpexpect.New(t, APISIXHost)
}
+func PrometheusExporterExpect() *httpexpect.Expect {
+ t := getTestingHandle()
+ return httpexpect.New(t, PrometheusExporter)
+}
+
func APISIXHTTPSExpect() *httpexpect.Expect {
t := getTestingHandle()
e := httpexpect.WithConfig(httpexpect.Config{
diff --git a/api/test/e2enew/route/route_with_plugin_prometheus_test.go b/api/test/e2enew/route/route_with_plugin_prometheus_test.go
index 2fda5c4..0906440 100644
--- a/api/test/e2enew/route/route_with_plugin_prometheus_test.go
+++ b/api/test/e2enew/route/route_with_plugin_prometheus_test.go
@@ -60,7 +60,7 @@ var _ = ginkgo.Describe("route with plugin prometheus", func() {
ExpectStatus: http.StatusOK,
}),
table.Entry("fetch the prometheus metric data", base.HttpTestCase{
- Object: base.APISIXExpect(),
+ Object: base.PrometheusExporterExpect(),
Method: http.MethodGet,
Path: "/apisix/prometheus/metrics",
ExpectStatus: http.StatusOK,
@@ -102,7 +102,7 @@ var _ = ginkgo.Describe("route with plugin prometheus", func() {
Sleep: base.SleepTime,
}),
table.Entry("verify the prometheus metric data (apisix_http_status 200)", base.HttpTestCase{
- Object: base.APISIXExpect(),
+ Object: base.PrometheusExporterExpect(),
Method: http.MethodGet,
Path: "/apisix/prometheus/metrics",
ExpectStatus: http.StatusOK,
@@ -110,7 +110,7 @@ var _ = ginkgo.Describe("route with plugin prometheus", func() {
Sleep: base.SleepTime,
}),
table.Entry("verify the prometheus metric data (apisix_http_status 404)", base.HttpTestCase{
- Object: base.APISIXExpect(),
+ Object: base.PrometheusExporterExpect(),
Method: http.MethodGet,
Path: "/apisix/prometheus/metrics",
ExpectStatus: http.StatusOK,
[apisix-dashboard] 03/03: docs: add CHANGELOG for version 2.7
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a commit to branch release/2.7
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit f9ecc298959e88a49054ddee155c8792152a7ddc
Author: nic-chen <jo...@163.com>
AuthorDate: Sun May 23 22:34:32 2021 +0800
docs: add CHANGELOG for version 2.7
---
CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6528d7d..27abc83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
# Table of Contents
+- [2.7.0](#270)
- [2.6.0](#260)
- [2.5.0](#250)
- [2.4.0](#240)
@@ -30,6 +31,39 @@
- [1.5.0](#150)
- [1.0.0](#100)
+# 2.7.0
+
+This release mainly fixes bugs, improves basic features and FE e2e test cases.
+
+Note: `Manager API` 2.7 should be used with [Apache APISIX 2.6](https://apisix.apache.org/downloads/). It is not recommended to use it with other Apache APISIX versions.
+
+### Core
+
+- Feat: support HTTPS for Manager API [#1824](https://github.com/apache/apisix-dashboard/pull/1824)
+- Feat: run manager-api as an OS agnostic service [#1667](https://github.com/apache/apisix-dashboard/pull/1667)
+- Feat: refactor Plugin Orchestration [#1813](https://github.com/apache/apisix-dashboard/pull/1813)
+- Feat: add the service page upstream select option [#1633](https://github.com/apache/apisix-dashboard/pull/1633)
+- Feat: improve the Duplicate Route feature [#1833](https://github.com/apache/apisix-dashboard/pull/1833)
+
+### Bugfix
+
+- Fix: can not configure upstream with no nodes [#1812](https://github.com/apache/apisix-dashboard/pull/1812)
+- Fix: add missing label in nodes component [#1823](https://github.com/apache/apisix-dashboard/pull/1823)
+- Fix: use remote address instead of client ip [#1831](https://github.com/apache/apisix-dashboard/pull/1831)
+- Fix: when create the upstream, some properties can still be edited on the preview page bug [#1828](https://github.com/apache/apisix-dashboard/pull/1828)
+- Fix: default cors plugin formdata validation error [#1855](https://github.com/apache/apisix-dashboard/pull/1855)
+- Fix: generate a uid when post a route without id [#1883](https://github.com/apache/apisix-dashboard/pull/1883)
+- Fix: route page Portable [#1887](https://github.com/apache/apisix-dashboard/pull/1887)
+- Fix: turn off online debug [#1903](https://github.com/apache/apisix-dashboard/pull/1903)
+- Fix: invalid import issues [#1899](https://github.com/apache/apisix-dashboard/pull/1899)
+- Fix: efficient error handling in manager-api including graceful shutdown, self contained methods. [#1814](https://github.com/apache/apisix-dashboard/pull/1814)
+
+### Test Case
+
+- Test: fix unstable FE E2E test case [#1826](https://github.com/apache/apisix-dashboard/pull/1826)
+- CI: fix gitleaks not allowed running [#1897](https://github.com/apache/apisix-dashboard/pull/1897)
+- Test: refactor FE E2E test case ([#1844](https://github.com/apache/apisix-dashboard/pull/1844) to [#1878](https://github.com/apache/apisix-dashboard/pull/1878) and a series of PRs)
+
# 2.6.0
This release mainly improves UI and UE, bugfix and adds test cases.
[apisix-dashboard] 01/03: chore: update version no
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenjunxu pushed a commit to branch release/2.7
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit cf5a1d46a4582b10e86718c4114f057425306aa6
Author: nic-chen <jo...@163.com>
AuthorDate: Sun May 23 22:33:05 2021 +0800
chore: update version no
---
README.md | 2 +-
api/VERSION | 2 +-
api/internal/utils/consts/versionMap.go | 1 +
docs/en/latest/deploy.md | 2 +-
docs/en/latest/develop.md | 2 +-
web/package.json | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 0011d3a..60361eb 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
- The master version should be used with Apache APISIX master version.
-- The latest released version is [2.6](https://apisix.apache.org/downloads/) and should be used with [Apache APISIX 2.5](https://apisix.apache.org/downloads/). It is not recommended to use with other Apache APISIX versions.
+- The latest released version is [2.7](https://apisix.apache.org/downloads/) and should be used with [Apache APISIX 2.6](https://apisix.apache.org/downloads/). It is not recommended to use with other Apache APISIX versions.
## What's Apache APISIX Dashboard
diff --git a/api/VERSION b/api/VERSION
index 5154b3f..1effb00 100644
--- a/api/VERSION
+++ b/api/VERSION
@@ -1 +1 @@
-2.6
+2.7
diff --git a/api/internal/utils/consts/versionMap.go b/api/internal/utils/consts/versionMap.go
index 038fe3e..d2448fe 100644
--- a/api/internal/utils/consts/versionMap.go
+++ b/api/internal/utils/consts/versionMap.go
@@ -25,4 +25,5 @@ var VersionMap = map[string]string{
"2.4": "2.3",
"2.5": "2.4",
"2.6": "2.5",
+ "2.7": "2.6",
}
diff --git a/docs/en/latest/deploy.md b/docs/en/latest/deploy.md
index b5a2e68..a25c04a 100644
--- a/docs/en/latest/deploy.md
+++ b/docs/en/latest/deploy.md
@@ -45,7 +45,7 @@ $ go env -w GOPROXY=https://goproxy.cn,direct
## Clone the project
```sh
-$ git clone -b release/2.6 https://github.com/apache/apisix-dashboard.git
+$ git clone -b release/2.7 https://github.com/apache/apisix-dashboard.git
```
## Build
diff --git a/docs/en/latest/develop.md b/docs/en/latest/develop.md
index 5c3d642..7784bd2 100644
--- a/docs/en/latest/develop.md
+++ b/docs/en/latest/develop.md
@@ -30,7 +30,7 @@ Before development, refer to this [guide](./deploy.md) to install dependencies.
## Clone the project
```sh
-$ git clone -b release/2.6 https://github.com/apache/apisix-dashboard.git
+$ git clone -b release/2.7 https://github.com/apache/apisix-dashboard.git
```
## Start developing
diff --git a/web/package.json b/web/package.json
index 8f425a4..54e62b6 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "apisix-dashboard",
- "version": "2.6.0",
+ "version": "2.7.0",
"private": true,
"description": "Dashboard for Apache APISIX",
"scripts": {