Skip to content

Commit 868e20e

Browse files
committed
automatic merge to finish v1.0.4
2 parents d3d6338 + 032e67f commit 868e20e

File tree

20 files changed

+984
-639
lines changed

20 files changed

+984
-639
lines changed

.github/workflows/build.yml renamed to .github/workflows/release.yml

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: release
22

33
on:
44
workflow_dispatch:
@@ -13,33 +13,40 @@ jobs:
1313
strategy:
1414
matrix:
1515
platform: [ macos-latest, ubuntu-latest, windows-latest ]
16-
#platform: [ ubuntu-latest ]
1716
runs-on: ${{ matrix.platform }}
1817
env:
1918
TAURI_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}"
2019
TAURI_KEY_PASSWORD: "${{ secrets.TAURI_KEY_PASSWORD }}"
20+
APPLE_CERTIFICATE: "${{ secrets.APPLE_CERTIFICATE }}"
21+
APPLE_CERTIFICATE_PASSWORD: "${{ secrets.APPLE_CERTIFICATE_PASSWORD }}"
22+
APPLE_SIGNING_IDENTITY: "${{ secrets.APPLE_SIGNING_IDENTITY }}"
23+
APPLE_ID: "${{ secrets.APPLE_ID }}"
24+
APPLE_PASSWORD: "${{ secrets.APPLE_PASSWORD }}"
25+
APPLE_TEAM_ID: "${{ secrets.APPLE_TEAM_ID }}"
2126

2227
steps:
2328
- uses: actions/checkout@v3
29+
2430
- uses: actions/setup-node@v3
2531
with:
26-
cache: yarn
27-
node-version: 18
32+
node-version: '20'
33+
cache: 'yarn'
34+
- run: yarn
2835

2936
- run: rustup toolchain install stable
30-
3137
- run: rustup target add aarch64-apple-darwin
3238
if: matrix.platform == 'macos-latest'
39+
- uses: swatinem/rust-cache@v2
40+
with:
41+
workspaces: './src-tauri -> target'
42+
key: ${{ matrix.platform }}
3343

3444
- name: (linux) install dependencies
3545
if: matrix.platform == 'ubuntu-latest'
3646
run: |
3747
sudo apt-get update
3848
sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 librsvg2-dev patchelf
3949
40-
- name: install app dependencies
41-
run: yarn
42-
4350
- name: build apple-silicon app
4451
if: matrix.platform == 'macos-latest'
4552
run: yarn tauri:build --target aarch64-apple-darwin
@@ -50,6 +57,18 @@ jobs:
5057
with:
5158
path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/elasticvue_*_aarch64.dmg
5259

60+
- name: (mac arm) rename artifacts
61+
if: matrix.platform == 'macos-latest'
62+
run: |
63+
mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64.app.tar.gz
64+
mv src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64.app.tar.gz.sig
65+
66+
- name: (mac arm) upload .app and artifacts
67+
if: matrix.platform == 'macos-latest'
68+
uses: actions/upload-artifact@v3
69+
with:
70+
path: src-tauri/target/aarch64-apple-darwin/release/bundle/macos/elasticvue_aarch64*
71+
5372
- run: yarn tauri:build
5473

5574
- name: (mac) upload .dmg
@@ -58,6 +77,18 @@ jobs:
5877
with:
5978
path: src-tauri/target/release/bundle/dmg/elasticvue_*_x64.dmg
6079

80+
- name: (mac) rename artifacts
81+
if: matrix.platform == 'macos-latest'
82+
run: |
83+
mv src-tauri/target/release/bundle/macos/elasticvue.app.tar.gz src-tauri/target/release/bundle/macos/elasticvue_x64.app.tar.gz
84+
mv src-tauri/target/release/bundle/macos/elasticvue.app.tar.gz.sig src-tauri/target/release/bundle/macos/elasticvue_x64.app.tar.gz.sig
85+
86+
- name: (mac) upload .app and artifacts
87+
if: matrix.platform == 'macos-latest'
88+
uses: actions/upload-artifact@v3
89+
with:
90+
path: src-tauri/target/release/bundle/macos/elasticvue_x64*
91+
6192
- name: (linux) upload .deb
6293
if: matrix.platform == 'ubuntu-latest'
6394
uses: actions/upload-artifact@v3
@@ -151,10 +182,6 @@ jobs:
151182
* [Mac x68 .dmg](https://github.com/cars10/elasticvue/releases/download/${{ github.ref_name }}/elasticvue_${{ steps.package-version.outputs.current-version }}_x64.dmg) / [Mac aarch64 .dmg](https://github.com/cars10/elasticvue/releases/download/${{ github.ref_name }}/elasticvue_${{ steps.package-version.outputs.current-version }}_aarch64.dmg)
152183
* [Windows .msi](https://github.com/cars10/elasticvue/releases/download/${{ github.ref_name }}/elasticvue_${{ steps.package-version.outputs.current-version }}_x64_en-US.msi)
153184
154-
If you get an error message when running the mac version of elasticvue (`"elasticvue" is damaged and can't be opened`) you might have to run (This happens because the builds are not signed yet):
155-
```
156-
xattr -cr elasticvue_1.0.0*.dmg
157-
```
158185
### Browser extension
159186
* [Google Chrome](https://chrome.google.com/webstore/detail/elasticvue/hkedbapjpblbodpgbajblpnlpenaebaa)
160187
* [Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/elasticvue/)

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run tests
1+
name: test
22

33
on:
44
push:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 1.0.4
4+
5+
* show shard size on hover, fixes [#199](https://github.com/cars10/elasticvue/pull/199) and [#203](https://github.com/cars10/elasticvue/pull/203)
6+
* fix cluster selection filter, fixes [#210](https://github.com/cars10/elasticvue/issues/210)
7+
* limit index bulk actions to 16 indices sent in chunks, fixes [#213](https://github.com/cars10/elasticvue/issues/213)
8+
39
## 1.0.3
410

511
* updates chinese translations. thanks @slow-groovin! [#192](https://github.com/cars10/elasticvue/pull/192)

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
[![Docker build](https://img.shields.io/docker/image-size/cars10/elasticvue)](https://hub.docker.com/r/cars10/elasticvue)
88
[![AUR version](https://img.shields.io/aur/version/elasticvue-bin?label=UNOFFICIAL%20aur)](https://aur.archlinux.org/packages/elasticvue-bin)
99

10+
English / [简体中文](./docs/README_CN.md)
11+
12+
1013
Elasticsearch gui for your browser [https://elasticvue.com](https://elasticvue.com)
1114

1215
> Elasticsearch is a trademark of Elasticsearch BV, registered in the U.S. and in other countries.

browser_extension/chrome/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Elasticvue",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"description": "Elasticsearch frontend",
55
"manifest_version": 3,
66
"icons": {

browser_extension/firefox/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Elasticvue",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"description": "Elasticsearch frontend",
55
"manifest_version": 2,
66
"icons": {

docs/README_CN.md

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
# elasticvue
2+
3+
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate?hosted_button_id=65GDZCZTUBVRL)
4+
[![Chrome web store](https://img.shields.io/chrome-web-store/v/hkedbapjpblbodpgbajblpnlpenaebaa?label=chrome%20extension)](https://chrome.google.com/webstore/detail/elasticvue/hkedbapjpblbodpgbajblpnlpenaebaa)
5+
[![Edge extension](https://img.shields.io/badge/dynamic/json?label=microsoft%20edge%20add-on&query=%24.version&url=https%3A%2F%2Fmicrosoftedge.microsoft.com%2Faddons%2Fgetproductdetailsbycrxid%2Fgeifniocjfnfilcbeloeidajlfmhdlgo)](https://microsoftedge.microsoft.com/addons/detail/geifniocjfnfilcbeloeidajlfmhdlgo)
6+
[![Firefox addon](https://img.shields.io/amo/v/elasticvue?label=firefox%20add-on)](https://addons.mozilla.org/en-US/firefox/addon/elasticvue/)
7+
[![Docker build](https://img.shields.io/docker/image-size/cars10/elasticvue)](https://hub.docker.com/r/cars10/elasticvue)
8+
[![AUR version](https://img.shields.io/aur/version/elasticvue-bin?label=UNOFFICIAL%20aur)](https://aur.archlinux.org/packages/elasticvue-bin)
9+
10+
Elasticsearch浏览器方式的可视化客户端 [https://elasticvue.com](https://elasticvue.com)
11+
12+
> Elasticsearch是Elasticsearch BV的商标,已在美国和其他国家注册。
13+
14+
[![Demo](http://static.cars10k.de/demo.gif)](http://static.cars10k.de/demo.gif)
15+
16+
目录
17+
18+
1. [关于](#about)
19+
2. [使用方法](#usage)
20+
3. [浏览器支持](#browser-support)
21+
4. [故障排除](#troubleshooting)
22+
5. [与其他前端的比较](#comparing-with-other-frontends)
23+
7. [国际化](#i18n)
24+
8. [贡献](#contributing)
25+
26+
## 关于
27+
28+
[功能介绍](https://elasticvue.com/features)
29+
30+
**Elasticvue**是一个免费且开源的Elasticsearch图形用户界面,您可以使用它来管理集群中的数据。
31+
它完全支持Elasticsearch版本 `8.x``7.x`。详细信息请查看
32+
[FAQ](https://github.com/cars10/elasticvue/wiki/FAQ)
33+
34+
### 功能
35+
36+
* 集群概览
37+
* 索引和别名管理
38+
* 分片管理
39+
* 搜索和编辑文档
40+
* REST查询
41+
* 快照和存储库管理
42+
43+
## 使用方法
44+
45+
您可以以多种方式使用elasticvue:
46+
47+
* **推荐:**[Linux、Mac和Windows平台的桌面端应用](#desktop-app)
48+
49+
其他方式:
50+
51+
* [适用于Chrome、Firefox和Edge的浏览器扩展](#browser-extensions)
52+
* [Docker镜像](#docker)
53+
* [Web版本](#web-version)
54+
* [自托管](#self-hosted)
55+
56+
### 桌面应用程序
57+
58+
请在[release](https://github.com/cars10/elasticvue/releases)中检查最新的桌面应用程序下载。
59+
60+
### 浏览器扩展
61+
62+
* [Google Chrome](https://chrome.google.com/webstore/detail/elasticvue/hkedbapjpblbodpgbajblpnlpenaebaa)
63+
* [Firefox](https://addons.mozilla.org/en-US/firefox/addon/elasticvue/)
64+
* [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/geifniocjfnfilcbeloeidajlfmhdlgo)
65+
66+
单击工具栏中的图标启动elasticvue。
67+
68+
### Docker
69+
70+
*如果您使用docker运行elasticvue,则必须配置您的Elasticsearch集群*
71+
使用[现有镜像](https://hub.docker.com/r/cars10/elasticvue)
72+
73+
```bash
74+
docker run -p 8080:8080 --name elasticvue -d cars10/elasticvue
75+
```
76+
77+
使用docker时,您可以为用户提供一些默认的集群配置。您可以设置一个环境变量或提供一个配置文件作为卷。无论哪种情况,内容都必须是一个表示集群的json数组,如下所示:
78+
79+
```json
80+
[
81+
{
82+
"name": "dev cluster",
83+
"uri": "http://localhost:9200"
84+
},
85+
{
86+
"name": "prod cluster",
87+
"uri": "http://localhost:9501",
88+
"username": "elastic",
89+
"password": "foobar"
90+
}
91+
]
92+
```
93+
94+
key`name``uri`是必需的,`username``password`是可选的。如果您想使用API密钥连接,只需将其用作密码并省略用户名。
95+
96+
#### 在环境变量中使用默认集群的Docker
97+
98+
使用环境变量`ELASTICVUE_CLUSTERS`的示例:
99+
100+
```bash
101+
docker run -p 8080:8080 -e ELASTICVUE_CLUSTERS='[{"name": "prod cluster", "uri": "http://localhost:9200", "username": "elastic", "password": "elastic"}]' cars10/elasticvue
102+
```
103+
104+
#### 通过卷使用配置文件中的默认集群的Docker
105+
106+
配置文件绑定到`/usr/share/nginx/html/api/default_clusters.json`的示例:
107+
108+
```bash
109+
echo '[{"name": "prod cluster", "uri": "http://localhost:9200", "username": "elastic", "password": "elastic"}]' > /config.json
110+
docker run -p 8080:8080 -v /config.json:/usr/share/nginx/html/api/default_clusters.json cars10/elasticvue
111+
```
112+
113+
使用者将被提示是否导入这些集群的可选选项。
114+
115+
### Web版本
116+
117+
*使用elasticvue的Web版本,需要配置Elasticsearch集群*
118+
访问[https://app.elasticvue.com](https://app.elasticvue.com)
119+
120+
### 自搭建(Self-hosted)
121+
122+
*自搭建elasticvue,需要配置Elasticsearch集群*
123+
请参考[wiki](https://github.com/cars10/elasticvue/wiki/Building-Elasticvue)了解更多信息。
124+
125+
## Elasticsearch配置
126+
127+
除了使用桌面应用程序或浏览器扩展,都必须[启用CORS](https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-network.html)以允许连接到您的Elasticsearch集群。
128+
129+
找到您的Elasticsearch配置文件(例如`/etc/elasticsearch/elasticsearch.yml`),并添加以下行:
130+
131+
```yaml
132+
# 启用CORS
133+
http.cors.enabled: true
134+
135+
# 然后根据您运行elasticvue的方式设置允许的来源。
136+
# 以下两种只选择一种:
137+
# Docker / 本地运行
138+
http.cors.allow-origin: "http://localhost:8080"
139+
# 在线版本
140+
http.cors.allow-origin: /https?:\/\/app.elasticvue.com/
141+
142+
# 如果您的集群使用authorization,您还必须添加:
143+
http.cors.allow-headers: X-Requested-With,Content-Type,Content-Length,Authorization
144+
```
145+
146+
如果您使用docker运行您的Elasticsearch集群,可以通过环境变量传递参数:
147+
148+
```bash
149+
docker run -p 9200:9200 \
150+
-e "http.cors.enabled=true" \
151+
-e "http.cors.allow-origin=/.*/" \
152+
elasticsearch
153+
```
154+
155+
配置完成后,重新启动集群,即可连接。
156+
157+
## 浏览器支持
158+
159+
任何当前版本的Chrome、Firefox和Edge (Chromium)应该可以正常工作。Safari大部分未经测试,因此体验可能会有所不同。
160+
161+
## 故障排除
162+
163+
在提issue之前,请尝试将elasticvue重置为默认设置:
164+
165+
1. 打开设置
166+
2. 下载当前elasticvue数据的备份
167+
3. 点击“断开连接并重置”
168+
169+
这将重置所有保存的过滤器,您需要重新连接到您的集群。如果问题仍然存在,请打开一个[issue](https://github.com/cars10/elasticvue/issues/new/choose)
170+
(用英语,作者不懂中文)
171+
## 与其他前端工具的比较
172+
173+
请参阅Wiki。[与其他前端工具的比较](https://github.com/cars10/elasticvue/wiki/Comparing-to-other-frontends)
174+
175+
## 国际化
176+
177+
Elasticvue提供以下语言版本:
178+
179+
* 英语
180+
* 中文(约80%翻译完成)
181+
182+
### 寻求帮助
183+
184+
我不会说中文,因此我依赖您的帮助来保持中文翻译的最新状态。如果您发现中文版本中有缺失或错误的翻译,请提交一个PR。
185+
186+
### 添加新语言
187+
188+
如果您想添加新的语言:请翻译`src/locales/en.json`并提交一个PR。
189+
190+
## 贡献
191+
192+
请参阅[CONTRIBUTING.md](CONTRIBUTING.md)
193+
194+
## License
195+
196+
MIT

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "elasticvue",
33
"private": true,
4-
"version": "1.0.3",
4+
"version": "1.0.4",
55
"scripts": {
66
"dev": "vite",
77
"build": "vite build",
@@ -27,27 +27,27 @@
2727
"pinia": "^2.1.7",
2828
"pinia-plugin-persistedstate": "^3.2.1",
2929
"pretty-bytes": "^6.1.1",
30-
"quasar": "^2.14.2",
31-
"vue": "^3.4.3",
32-
"vue-i18n": "^9.8.0",
30+
"quasar": "^2.14.4",
31+
"vue": "^3.4.19",
32+
"vue-i18n": "^9.9.1",
3333
"vue-resizable": "^2.1.7",
3434
"vue-router": "^4.2.5"
3535
},
3636
"devDependencies": {
37-
"@playwright/test": "^1.40.1",
37+
"@playwright/test": "^1.41.2",
3838
"@quasar/vite-plugin": "^1.6.0",
3939
"@tauri-apps/cli": "^1.5.9",
4040
"@types/json-bigint": "^1.0.4",
41-
"@vitejs/plugin-vue": "^5.0.2",
41+
"@vitejs/plugin-vue": "^5.0.4",
4242
"@vue/eslint-config-typescript": "^12.0.0",
4343
"@vue/tsconfig": "^0.5.1",
4444
"eslint": "^8.56.0",
45-
"eslint-plugin-vue": "^9.19.2",
46-
"sass": "^1.69.6",
45+
"eslint-plugin-vue": "^9.21.1",
46+
"sass": "^1.71.0",
4747
"typescript": "^5.3.3",
48-
"vite": "^5.0.10",
49-
"vite-bundle-visualizer": "^1.0.0",
50-
"vitest": "^1.1.0",
48+
"vite": "^5.1.3",
49+
"vite-bundle-visualizer": "^1.0.1",
50+
"vitest": "^1.3.0",
5151
"vue-tsc": "^1.8.27"
5252
}
5353
}

0 commit comments

Comments
 (0)