Skip to content

[pull] master from 0xbug:master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 13 commits into
base: master
Choose a base branch
from
Open

[pull] master from 0xbug:master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9acfd7f
添加企业微信告警支持；优化交互
0xbug Jul 2, 2019
579bde2
fix bug
0xbug Jul 2, 2019
0200bad
Update Dockerfile
0xbug Jul 18, 2019
5760841
Update Dockerfile
0xbug Jul 18, 2019
aeeac47
Update Dockerfile
0xbug Jul 18, 2019
37da818
优化
0xbug Aug 2, 2019
3a38475
解决"ImportError: cannot import name 'Feature' from 'setuptools'"
xsser Jun 9, 2020
bb59314
Update Dockerfile
0xbug Jul 6, 2020
b8e58fb
Update README.MD
0xbug Jul 27, 2020
68ab359
Update: README.MD
15ho Jul 31, 2020
8da4c4e
Update README.MD
0xbug Nov 20, 2020
a399038
Update README.MD
0xbug Nov 20, 2020
3ef48c2
Update README.MD
0xbug Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
FROM python:3.7
FROM python:3.7-stretch
LABEL MAINTAINER=0xbug
ENV TZ=Asia/Shanghai
EXPOSE 80
RUN apt-get update
RUN apt-get install --no-install-recommends -y curl gnupg git redis-server supervisor software-properties-common wget
RUN curl https://openresty.org/package/pubkey.gpg | apt-key add -
RUN add-apt-repository -y "deb http://openresty.org/package/debian $(lsb_release -sc) openresty"
RUN add-apt-repository -y "deb http://openresty.org/package/debian stretch openresty"
RUN apt-get update
RUN apt-get install -y openresty
COPY ./deploy /Hawkeye/deploy
RUN pip install --upgrade pip setuptools==45.2.0
RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r /Hawkeye/deploy/pyenv/requirements.txt -U
RUN cp /Hawkeye/deploy/nginx/*.conf /usr/local/openresty/nginx/conf/
RUN cp /Hawkeye/deploy/supervisor/*.conf /etc/supervisor/conf.d/
COPY ./client/dist /Hawkeye/client/dist
COPY ./server /Hawkeye/server
WORKDIR /Hawkeye/server
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
COPY ./docker-entrypoint.sh ./
RUN chmod +x docker-entrypoint.sh
CMD ["./docker-entrypoint.sh"]
35 changes: 27 additions & 8 deletions README.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@

![Hawkeye](https://user-images.githubusercontent.com/12611275/46849889-0d2d0980-ce24-11e8-832e-35f6f935bf3b.png)
## **最近更新**

- 2020-11-20
由于 GitHub 官方限制了API的账号密码认证，导致在配置 GitHub 账号时，需要账号输入框输入生成的 [token，不需要勾选多余的权限](https://github.com/settings/tokens)，**密码输入框先输入空格然后删除空格**，最后点击添加

- 2019-07-02 v3.0.1
- 添加健康检查接口 /api/health
- 添加企业微信告警
- 支持翻页刷新

- 2018-10-12 v3.0.0 非兼容性更新,需配置新数据库
- 搜索方式切换成API，支持添加多GitHub用户，API配额可视化
- 配置可视化，去除配置文件
Expand Down Expand Up @@ -47,6 +56,11 @@
## 安装(Docker 部署)
```
docker pull daocloud.io/0xbug/hawkeye
## mongodb 需认证
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://username:password@ip:27017/hawkeye -e MONGODB_USER= -e MONGODB_PASSWORD= -d daocloud.io/0xbug/hawkeye
## mongodb 无认证
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://ip:27017 -d daocloud.io/0xbug/hawkeye

```
或者手动 build

Expand All @@ -56,18 +70,23 @@ docker pull daocloud.io/0xbug/hawkeye
git clone https://github.com/0xbug/Hawkeye.git --depth 1
cd Hawkeye
docker build -t hawkeye .
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://username:password@ip:27017/hawkeye -e MONGODB_USER= -e MONGODB_PASSWORD= -d hawkeye ## mongodb 需认证
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://ip:27017 -d hawkeye ## mongodb 无认证
## mongodb 需认证
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://username:password@ip:27017/hawkeye -e MONGODB_USER= -e MONGODB_PASSWORD= -d hawkeye
## mongodb 无认证
docker run -ti -p 80:80 -e MONGODB_URI=mongodb://ip:27017 -d hawkeye

```

或者使用docker安装mongodb

Hawkeye 支持 Python *3.x* on Linux and macOS。(2.x兼容性 需自行修改测试)


mongodb无认证，快速开始
```bash
## 启动mongodb
docker run -itd --name mongo -p 27017:27017 mongo

## 捐赠
## 启动hawkeye
docker run -ti --link mongo:mongo -p 80:80 -e MONGODB_URI=mongodb://mongo:27017 -d daocloud.io/0xbug/hawkeye
```

> 如果该项目对您有帮助，您可以捐赠支持一下 谢谢！

![](https://user-images.githubusercontent.com/12611275/48882508-a9035980-ee55-11e8-9b2f-59346504e196.png)
Hawkeye 支持 Python *3.x* on Linux and macOS。(2.x兼容性 需自行修改测试)
0 client/dist/css/chunk-ef414624.cadfa055.css → client/dist/css/chunk-0cb8a21e.cadfa055.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion client/dist/css/chunk-35157e29.3ddd46a1.css → client/dist/css/chunk-1b5e6468.30b07c32.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 client/dist/css/chunk-b7bcb3e8.c91eea29.css → client/dist/css/chunk-23e0191c.c91eea29.css
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions client/dist/css/chunk-29d116de.8f86470e.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 client/dist/css/chunk-dd8d57ec.0ddb7e78.css → client/dist/css/chunk-3ad7cbfa.b60f58e2.css
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion client/dist/css/chunk-46894ef4.ab074283.css
View file
Open in desktop

This file was deleted.

0 client/dist/css/chunk-2eeda272.f8312f18.css → client/dist/css/chunk-78d8f7d4.f8312f18.css
View file
Open in desktop
File renamed without changes.
0 client/dist/css/chunk-57a8969a.552fa373.css → client/dist/css/chunk-88e65a68.552fa373.css
View file
Open in desktop
File renamed without changes.
0 client/dist/css/chunk-2d05f298.fdc0c732.css → client/dist/css/chunk-f603ab4a.fdc0c732.css
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions client/dist/css/chunk-vendors.46f94e1b.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion client/dist/css/chunk-vendors.9c8e3772.css
View file
Open in desktop

This file was deleted.

Binary file removed client/dist/fonts/element-icons.2fad952a.woff
View file
Open in desktop
Binary file not shown.
Binary file added client/dist/fonts/element-icons.535877f5.woff
View file
Open in desktop
Binary file not shown.
Binary file removed client/dist/fonts/element-icons.6f0a7632.ttf
View file
Open in desktop
Binary file not shown.
Binary file added client/dist/fonts/element-icons.732389de.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion client/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_513681_tv3n9oofkli.css><title>Hawkeye</title><link href=/css/chunk-2d05f298.fdc0c732.css rel=prefetch><link href=/css/chunk-2eeda272.f8312f18.css rel=prefetch><link href=/css/chunk-35157e29.3ddd46a1.css rel=prefetch><link href=/css/chunk-46894ef4.ab074283.css rel=prefetch><link href=/css/chunk-57a8969a.552fa373.css rel=prefetch><link href=/css/chunk-b7bcb3e8.c91eea29.css rel=prefetch><link href=/css/chunk-dd8d57ec.0ddb7e78.css rel=prefetch><link href=/css/chunk-ef414624.cadfa055.css rel=prefetch><link href=/js/chunk-2d05f298.25f33395.js rel=prefetch><link href=/js/chunk-2d0e5db1.884b5f27.js rel=prefetch><link href=/js/chunk-2d0e8ba4.2bd538eb.js rel=prefetch><link href=/js/chunk-2eeda272.bf38db06.js rel=prefetch><link href=/js/chunk-35157e29.fdf9a6f4.js rel=prefetch><link href=/js/chunk-46894ef4.4bf25691.js rel=prefetch><link href=/js/chunk-57a8969a.8e185b7a.js rel=prefetch><link href=/js/chunk-8e5b0408.ae2cbe65.js rel=prefetch><link href=/js/chunk-b7bcb3e8.b34fb707.js rel=prefetch><link href=/js/chunk-dd8d57ec.2b671488.js rel=prefetch><link href=/js/chunk-ef414624.3dcae87d.js rel=prefetch><link href=/css/app.3e0479d6.css rel=preload as=style><link href=/css/chunk-vendors.9c8e3772.css rel=preload as=style><link href=/js/app.d61e1d19.js rel=preload as=script><link href=/js/chunk-vendors.fcfa4007.js rel=preload as=script><link href=/css/chunk-vendors.9c8e3772.css rel=stylesheet><link href=/css/app.3e0479d6.css rel=stylesheet></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.fcfa4007.js></script><script src=/js/app.d61e1d19.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_513681_qliq3hvsj9t.css><title>Hawkeye</title><link href=/css/chunk-0cb8a21e.cadfa055.css rel=prefetch><link href=/css/chunk-1b5e6468.30b07c32.css rel=prefetch><link href=/css/chunk-23e0191c.c91eea29.css rel=prefetch><link href=/css/chunk-29d116de.8f86470e.css rel=prefetch><link href=/css/chunk-3ad7cbfa.b60f58e2.css rel=prefetch><link href=/css/chunk-78d8f7d4.f8312f18.css rel=prefetch><link href=/css/chunk-88e65a68.552fa373.css rel=prefetch><link href=/css/chunk-f603ab4a.fdc0c732.css rel=prefetch><link href=/js/chunk-0cb8a21e.9054a38e.js rel=prefetch><link href=/js/chunk-1b5e6468.9b76e4aa.js rel=prefetch><link href=/js/chunk-23e0191c.b2c34538.js rel=prefetch><link href=/js/chunk-29d116de.809f9ffa.js rel=prefetch><link href=/js/chunk-2d0e5db1.aac3ca3f.js rel=prefetch><link href=/js/chunk-2d0e8ba4.ea6cb7b3.js rel=prefetch><link href=/js/chunk-3ad7cbfa.5e293c91.js rel=prefetch><link href=/js/chunk-78d8f7d4.c7406151.js rel=prefetch><link href=/js/chunk-88e65a68.9c08552b.js rel=prefetch><link href=/js/chunk-ebb8050c.2243400d.js rel=prefetch><link href=/js/chunk-f603ab4a.e93a6b4d.js rel=prefetch><link href=/css/app.3e0479d6.css rel=preload as=style><link href=/css/chunk-vendors.46f94e1b.css rel=preload as=style><link href=/js/app.ff842fe3.js rel=preload as=script><link href=/js/chunk-vendors.c2087aaf.js rel=preload as=script><link href=/css/chunk-vendors.46f94e1b.css rel=stylesheet><link href=/css/app.3e0479d6.css rel=stylesheet></head><body><noscript><strong>We're sorry but client doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.c2087aaf.js></script><script src=/js/app.ff842fe3.js></script></body></html>
1 change: 0 additions & 1 deletion client/dist/js/app.d61e1d19.js
View file
Open in desktop

This file was deleted.

Loading