Skip to content
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

Some Fixes #3158

Closed
wants to merge 44 commits into from
Closed

Some Fixes #3158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0eaa0ee
fix ruletypes.rst typo
nsano-rururu Mar 28, 2021
9c563b2
Fix Pagertree
nsano-rururu Mar 28, 2021
c6671c5
Fix LineNotify
nsano-rururu Mar 28, 2021
eacc861
Fix docker test etc.
nsano-rururu Mar 28, 2021
679a9e3
Remove Duplicate Key in Schema YAML
nsano-rururu Mar 28, 2021
f0a0e29
Fix travis-ci job error
nsano-rururu Mar 28, 2021
be1cc1f
Pin elasticsearch to 7.0.0 in requirements.txt
nsano-rururu Mar 28, 2021
2022b5a
requirements.txt to match the jira-version
nsano-rururu Mar 28, 2021
b3e1f8f
Update README.md
nsano-rururu Mar 28, 2021
c62f084
add opsgenie_addr to docs
nsano-rururu Mar 28, 2021
26eee10
Fix Zabbix(Docs & schema.yaml)
nsano-rururu Mar 28, 2021
95c65a5
Fix SNS(Program & Docs)
nsano-rururu Mar 28, 2021
e03cb5c
Fix opsgenie_default_recipients
nsano-rururu Mar 28, 2021
04e2c52
added docs opsgenie_proxy
nsano-rururu Mar 28, 2021
595e02a
added docs pagertree_proxy
nsano-rururu Mar 28, 2021
8cb0611
added docs telegram
nsano-rururu Mar 28, 2021
297e966
added docs slack_ca_certs
nsano-rururu Mar 28, 2021
088d637
added docs slack_ignore_ssl_errors
nsano-rururu Mar 28, 2021
33efb23
Change Library blist to sortedcontainers
nsano-rururu Mar 28, 2021
9aaa9c9
Fix docs stomp
nsano-rururu Mar 28, 2021
76ff251
Fix Stomp
nsano-rururu Mar 28, 2021
63a968d
added docs alerta_api_skip_ssl
nsano-rururu Mar 28, 2021
0a08104
added docs hive_verify
nsano-rururu Mar 28, 2021
a8eed46
Fix elasticsearch-py test_rule.py error
nsano-rururu Mar 28, 2021
0a60564
Typo in examples_rules/ssh.yaml
nsano-rururu Mar 28, 2021
e4225ac
Sync requirements.txt and setup.py
nsano-rururu Mar 28, 2021
7039bdd
fix docs slack_timeout
nsano-rururu Mar 28, 2021
8fc961c
added docs jira_assignee
nsano-rururu Mar 28, 2021
b3db65e
added docs slack
nsano-rururu Mar 28, 2021
92cda32
remove alerta_new_style_string_format
nsano-rururu Mar 28, 2021
0a59e08
Remove new_style_string_format
nsano-rururu Mar 28, 2021
3d8e95e
Fix docs external link URL
nsano-rururu Mar 28, 2021
0f0ed81
Add tzlocal<3.0
nsano-rururu Mar 28, 2021
7df8e96
Fix Logging to elastalert_logger
nsano-rururu Mar 28, 2021
04f2cd0
Fixed the logging property in config.yaml.example
nsano-rururu Mar 28, 2021
f16c0db
Remove duplicate property in example config file
nsano-rururu Mar 28, 2021
f39ed87
Kibana Discover app link 7.4 -7.11 support
nsano-rururu Mar 28, 2021
94323bb
Remove Stride integration
nsano-rururu Mar 29, 2021
b07bd7b
Remove hipchat integration
nsano-rururu Mar 29, 2021
86be6ed
Revert pytest version
nsano-rururu Mar 29, 2021
f412351
Kibana Discover support kibana 7.12
nsano-rururu Apr 4, 2021
bd102a2
apscheduler>=3.3.0,<4.0
nsano-rururu Apr 12, 2021
36af158
sphinx 1.6.6 to 3.5.4
nsano-rururu Apr 14, 2021
ec9e609
python 3.6 to 3.8
nsano-rururu Apr 14, 2021
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
Prev Previous commit
python 3.6 to 3.8
  • Loading branch information
@nsano-rururu
nsano-rururu committed Apr 14, 2021
commit ec9e60963643995aaa2693a0b827bd391618afd8
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: python
python:
- '3.6'
- '3.8'
env:
- TOXENV=docs
- TOXENV=py36
- TOXENV=py38
install:
- pip install tox
- >
Expand All @@ -23,12 +23,12 @@ script:
jobs:
include:
- stage: 'Elasticsearch test'
env: TOXENV=py36 ES_VERSION=7.0.0-linux-x86_64
- env: TOXENV=py36 ES_VERSION=6.6.2
- env: TOXENV=py36 ES_VERSION=6.3.2
- env: TOXENV=py36 ES_VERSION=6.2.4
- env: TOXENV=py36 ES_VERSION=6.0.1
- env: TOXENV=py36 ES_VERSION=5.6.16
env: TOXENV=py38 ES_VERSION=7.0.0-linux-x86_64
- env: TOXENV=py38 ES_VERSION=6.6.2
- env: TOXENV=py38 ES_VERSION=6.3.2
- env: TOXENV=py38 ES_VERSION=6.2.4
- env: TOXENV=py38 ES_VERSION=6.0.1
- env: TOXENV=py38 ES_VERSION=5.6.16

deploy:
provider: pypi
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:latest
RUN apt-get update && apt-get upgrade -y
RUN apt-get install software-properties-common -y
RUN add-apt-repository ppa:deadsnakes/ppa
RUN apt-get -y install build-essential python3.6 python3.6-dev python3-pip libssl-dev git
RUN apt-get -y install build-essential python3.8 python3.8-dev python3-pip libssl-dev git

WORKDIR /home/elastalert

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Recent changes: As of Elastalert 0.2.0, you must use Python 3.6. Python 2 will not longer be supported.
Recent changes: As of Elastalert 0.2.0, you must use Python 3.8. Python 2 will not longer be supported.

[![Build Status](https://travis-ci.org/Yelp/elastalert.svg)](https://travis-ci.org/Yelp/elastalert)
[![Join the chat at https://gitter.im/Yelp/elastalert](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Yelp/elastalert?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down
5 changes: 3 additions & 2 deletions docs/source/running_elastalert.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ Requirements

- Elasticsearch
- ISO8601 or Unix timestamped data
- Python 3.6
- Python 3.8
- pip, see requirements.txt
- Packages on Ubuntu 14.x: python-pip python-dev libffi-dev libssl-dev
- Packages on Ubuntu 18.x: build-essential python3-pip python3.8 python3.8-dev libffi-dev libssl-dev
- Packages on Ubuntu 20.x: build-essential python3-pip python3.8 python3.8-dev libffi-dev libssl-dev

Downloading and Configuring
---------------------------
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
setup_requires='setuptools',
license='Copyright 2014 Yelp',
classifiers=[
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.8',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
project = elastalert
envlist = py36,docs
envlist = py38,docs

[testenv]
deps = -rrequirements-dev.txt
Expand Down