Skip to content

Commit

Permalink
Merge pull request #44 from mdebarros/fix/v13.0.0-release.2
Browse files Browse the repository at this point in the history
fix(release): v13.0.0-release.1
- updated readme for clarity
- updated dependencies
- bump to major version
- added .gitignore rule for files containing IGNORE in names, and devspace configs
- fixes to CI/CD issue with installing AWS dependencies
- fixes to audit resolve
  • Loading branch information
mdebarros authored Jul 1, 2021
2 parents 85995eb + fc52caf commit e8edf6f
Show file tree
Hide file tree
Showing 6 changed files with 739 additions and 1,452 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ defaults_Dependencies: &defaults_Dependencies |
npm install -g node-gyp

defaults_awsCliDependencies: &defaults_awsCliDependencies |
apk upgrade --no-cache
apk --no-cache add \
python \
py-pip \
python3 \
py3-pip \
groff \
less \
mailcap
pip install --upgrade awscli==1.14.5 s3cmd==2.0.1 python-magic
apk -v --purge del py-pip
pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic

defaults_license_scanner: &defaults_license_scanner
name: Install and set up license-scanner
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,10 @@ typings/

# VSCode directory
.vscode

# devspace configuration
.devspace
devspace*

# IGNORE
*IGNORE*
35 changes: 24 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,67 @@
# event-stream-processor
** EXPERIMENTAL** Event Stream Processor (ESP) for Event Stream (logs, audits, errors, trace, etc)

**EXPERIMENTAL** Event Stream Processor (ESP) for Event Stream (logs, audits, errors, trace, etc)

## 1. Pre-requisites

### 1.1 Elasticsearch

Ensure that you have created the following resources prior to deploying the ESP component:

1. [Create a Policy](#1111-create) with the desired Rollover configurations: [policy-rollover-mojaloop.json](./config/policy-rollover-mojaloop.json)
2. [Create a Template](#1121-create) to associate the Policy Settings to the Logstash index based on the following config: [template-mojaloop.json](./config/template-mojaloop.json)

> __NOTE__:<br/>
> __NOTE__:
> If ESP component is running prior to configuring the above template, the index mapping will be auto-created and will not take effect.
<br/>

#### 1.1.1 Mojaloop Index Rollover Policy

##### 1.1.1.1 Create

```curl
curl -X PUT "http://elasticsearch:9200/_ilm/policy/mojaloop_rollover_policy?pretty" -H 'Content-Type: application/json' -d @config/policy-rollover-mojaloop.json
```

##### 1.1.1.2 Delete
_Note: only needed if you need to remove the policy_

> __NOTE__:
> only needed if you need to remove the policy_
```curl
curl -X DELETE "http://elasticsearch:9200/_ilm/policy/mojaloop_rollover_policy?"
```

#### 1.1.1.3 Get
_Note: useful for debugging issues_

> __NOTE__:
> useful for debugging issues_
```curl
curl -X GET "http://elasticsearch:9200/_ilm/policy/mojaloop_rollover_policy?"
```

#### 1.1.2 Mojaloop Index Template

##### 1.1.2.1 Create

```curl
curl -X PUT "http://elasticsearch:9200/_template/moja_template?pretty" -H 'Content-Type: application/json' -d @config/template-mojaloop.json'
```

##### 1.1.2.2 Delete
_Note: only needed if you need to remove the template_

> __NOTE__:
> only needed if you need to remove the template_
```curl
curl -X DELETE "http://elasticsearch:9200/_template/moja_template"
```

#### 1.1.3 Get Template
_Note: useful for debugging template issues_

#### 1.1.3 Get Template

> __NOTE__:
useful for debugging template issues_

```curl
curl -X GET "http://elasticsearch:9200/_template/moja_template"
```

17 changes: 8 additions & 9 deletions audit-resolve.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,12 @@
},
"1500|@mojaloop/central-services-shared>widdershins>yargs>yargs-parser": {
"decision": "ignore",
"madeAt": 1620986559684,
"expiresAt": 1621591332977
"madeAt": 1625158172377,
"expiresAt": 1625762958048
},
"1677|@mojaloop/elastic-apm-node>read-pkg-up>read-pkg>normalize-package-data>hosted-git-info": {
"decision": "ignore",
"madeAt": 1620986557949,
"expiresAt": 1621591332977
"decision": "fix",
"madeAt": 1625158168883
},
"1673|@mojaloop/central-services-health>@mojaloop/central-services-error-handling>lodash": {
"decision": "ignore",
Expand Down Expand Up @@ -215,8 +214,8 @@
},
"1675|@mojaloop/central-services-shared>shins>sanitize-html": {
"decision": "ignore",
"madeAt": 1620986563987,
"expiresAt": 1621591332977
"madeAt": 1625158174063,
"expiresAt": 1625762958048
},
"1676|@mojaloop/central-services-health>@mojaloop/central-services-shared>shins>sanitize-html": {
"decision": "ignore",
Expand All @@ -225,8 +224,8 @@
},
"1676|@mojaloop/central-services-shared>shins>sanitize-html": {
"decision": "ignore",
"madeAt": 1620986563987,
"expiresAt": 1621591332977
"madeAt": 1625158174063,
"expiresAt": 1625762958048
},
"1693|@mojaloop/central-services-health>@mojaloop/central-services-shared>shins>sanitize-html>postcss": {
"decision": "ignore",
Expand Down
Loading

0 comments on commit e8edf6f

Please sign in to comment.