Skip to content

Commit bce7bc3

Browse files
authored
Release v1.0.7 (#40)
- ci: use shared GHA workflows - ci: add submodule .release - es7: update index map template
1 parent 7368883 commit bce7bc3

12 files changed

+118
-94
lines changed

.github/dependabot.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: "npm"
6+
directory: "/"
7+
schedule:
8+
interval: "weekly"
9+
allow:
10+
- dependency-type: production

.github/workflows/ci-test.yml

-47
This file was deleted.

.github/workflows/ci.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: CI
2+
3+
on: [ push ]
4+
5+
env:
6+
CI: true
7+
8+
jobs:
9+
10+
lint:
11+
uses: haraka/.github/.github/workflows/lint.yml@master
12+
13+
# coverage:
14+
# uses: haraka/.github/.github/workflows/coverage.yml@master
15+
# secrets: inherit
16+
17+
test:
18+
needs: [ lint, get-lts ]
19+
runs-on: ${{ matrix.os }}
20+
strategy:
21+
matrix:
22+
os: [ ubuntu-latest ]
23+
node-version: ${{ fromJson(needs.get-lts.outputs.active) }}
24+
fail-fast: false
25+
steps:
26+
- name: Configure sysctl limits
27+
run: |
28+
sudo swapoff -a
29+
sudo sysctl -w vm.swappiness=1
30+
sudo sysctl -w fs.file-max=262144
31+
sudo sysctl -w vm.max_map_count=262144
32+
- uses: miyataka/elasticsearch-github-actions@1
33+
with:
34+
stack-version: '7.6.2'
35+
- uses: actions/checkout@v3
36+
- uses: actions/setup-node@v3
37+
name: Node ${{ matrix.node-version }} on ${{ matrix.os }}
38+
with:
39+
node-version: ${{ matrix.node-version }}
40+
- run: npm install
41+
- run: npm test
42+
43+
get-lts:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- id: get
47+
uses: msimerson/node-lts-versions@v1
48+
outputs:
49+
active: ${{ steps.get.outputs.active }}
50+
lts: ${{ steps.get.outputs.lts }}

.github/workflows/codeql.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
schedule:
9+
- cron: '18 7 * * 4'
10+
11+
jobs:
12+
codeql:
13+
uses: haraka/.github/.github/workflows/codeql.yml@master

.github/workflows/lint.yml

-33
This file was deleted.

.github/workflows/publish.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: publish
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
env:
9+
CI: true
10+
11+
jobs:
12+
publish:
13+
uses: haraka/.github/.github/workflows/publish.yml@master
14+
secrets: inherit

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ typings/
5858
.env
5959

6060
package-lock.json
61+
62+
haraka-update.sh

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule ".release"]
2+
path = .release
3+
url = [email protected]:msimerson/.release.git

.release

Submodule .release added at 9be2b27

Changes.md

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,53 @@
1+
### Unreleased
12

2-
## 1.0.6 - 2020-07-21
3+
4+
### [1.0.7] - 2022-06-06
5+
6+
- ci: use shared GHA workflows
7+
- ci: add submodule .release
8+
- es7: update index map template
9+
10+
11+
### 1.0.6 - 2020-07-21
312

413
- add URI for connection settings
514
- add options to specify user & ssl connection settings
615
- bump elasticsearch client to version 7.8
716

817

9-
## 1.0.5 - 2020-04-29
18+
### 1.0.5 - 2020-04-29
1019

1120
- update to upstream @elastic/elasticsearch@6
1221
- convert test runner to mocha
1322
- use GitHub actions instead of Travis & AppVeyor
1423
- package.json: depend on latest eslint
1524

1625

17-
## 1.0.4 - 2019-09-22
26+
### 1.0.4 - 2019-09-22
1827

1928
- update index template for ES 6
2029

2130

22-
## 1.0.3 - 2017-08-22
31+
### 1.0.3 - 2017-08-22
2332

2433
- fix txr variable scope
2534
- add tests for get_es_hosts
2635

2736

28-
## 1.0.2 - 2017-07-29
37+
### 1.0.2 - 2017-07-29
2938

3039
- also prune null values because typeof null === object
3140
- add test storing doc against index template
3241
- get ES testing working on AppVeyor (windows)
3342

3443

35-
## 1.0.1 - 2017-07-29
44+
### 1.0.1 - 2017-07-29
3645

3746
- qualify the path to plugin.\*.msg to avoid collision
3847

3948

40-
## 1.0.0 - 2017-07-14
49+
### 1.0.0 - 2017-07-14
4150

4251
- initial release
52+
53+
[1.0.7]: https://github.com/haraka/haraka-plugin-elasticsearch/releases/tag/1.0.7

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ curl -X PUT 'http://localhost:9200/_template/haraka_results' -H 'Content-Type: a
9494

9595

9696
<!-- leave these buried at the bottom of the document -->
97-
[ci-img]: https://github.com/haraka/haraka-plugin-elasticsearch/workflows/Unit%20Tests/badge.svg
98-
[ci-url]: https://github.com/haraka/haraka-plugin-elasticsearch/actions?query=workflow%3A%22Unit+Tests%22
97+
[ci-img]: https://github.com/haraka/haraka-plugin-elasticsearch/actions/workflows/ci.yml/badge.svg
98+
[ci-url]: https://github.com/haraka/haraka-plugin-elasticsearch/actions/workflows/ci.yml
9999
[clim-img]: https://codeclimate.com/github/haraka/haraka-plugin-elasticsearch/badges/gpa.svg
100100
[clim-url]: https://codeclimate.com/github/haraka/haraka-plugin-elasticsearch
101101
[npm-img]: https://nodei.co/npm/haraka-plugin-elasticsearch.png

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "haraka-plugin-elasticsearch",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "Haraka plugin that saves logs to Elasticsearch",
55
"main": "index.js",
66
"scripts": {
7-
"lint": "npx eslint *.js test/*.js",
8-
"lintfix": "npx eslint --fix *.js test/*.js",
7+
"lint": "npx eslint *.js test",
8+
"lintfix": "npx eslint --fix *.js test",
99
"test": "npx mocha"
1010
},
1111
"repository": {
@@ -28,9 +28,9 @@
2828
"haraka-utils": "*"
2929
},
3030
"devDependencies": {
31-
"eslint": "*",
31+
"eslint": ">=8",
3232
"eslint-plugin-haraka": "*",
3333
"haraka-test-fixtures": "*",
34-
"mocha": "*"
34+
"mocha": ">=9"
3535
}
3636
}

0 commit comments

Comments
 (0)