Skip to content

Commit

Permalink
Merge pull request #359 from simlu/dev
Browse files Browse the repository at this point in the history
fix: moved to blackflux
  • Loading branch information
simlu authored Oct 26, 2018
2 parents 3b13236 + 9e6f8a5 commit 55ddd01
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 41 deletions.
50 changes: 50 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally
- test-node-v10
- test-node-v8.10
- release:
requires:
- gally
- test-node-v10
- test-node-v8.10
filters:
branches:
only: master
version: 2
jobs:
gally:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run: sudo npm i -g gally
- run: ga promote $CIRCLE_BRANCH
test-node-v10:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run: npm i
- run: npm t
- run:
command: |
if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
npm run coveralls
fi
test-node-v8.10:
docker:
- image: 'circleci/node:8.10'
steps:
- checkout
- run: npm i
- run: npm t
release:
docker:
- image: 'circleci/node:10'
steps:
- checkout
- run: npm i
- run: npm run semantic-release
27 changes: 18 additions & 9 deletions .gally.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"defaultBranch": "master",
"contribBranch": "dev",
"repository": {
"url": "https://github.com/simlu/lambda-monitor.git"
"url": "https://github.com/blackflux/lambda-monitor.git"
},
"branches": {
"dev": {
Expand All @@ -26,32 +26,41 @@
},
"protection": {
"$full-dev": {
"@": "$full",
"enforce_admins": false
"@": "$full"
},
"$full-master": {
"@": "$full",
"required_status_checks": {
"strict": false
},
"enforce_admins": false
}
},
"$full": {
"required_status_checks": {
"strict": true,
"contexts": [
"continuous-integration/travis-ci/pr",
"continuous-integration/travis-ci/push",
"coverage/coveralls"
"ci/circleci: gally",
"ci/circleci: test-node-v10",
"ci/circleci: test-node-v8.10"
]
},
"enforce_admins": true,
"required_pull_request_reviews": {
"dismissal_restrictions": {
"users": [
"simlu"
],
"teams": []
},
"dismiss_stale_reviews": true,
"require_code_owner_reviews": true,
"required_approving_review_count": 1
},
"restrictions": null
"restrictions": {
"users": [
"simlu"
],
"teams": []
}
}
}
}
20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Lambda Monitoring

[![Build Status](https://img.shields.io/travis/simlu/lambda-monitor/master.svg)](https://travis-ci.org/simlu/lambda-monitor)
[![Test Coverage](https://img.shields.io/coveralls/simlu/lambda-monitor/master.svg)](https://coveralls.io/github/simlu/lambda-monitor?branch=master)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=simlu/lambda-monitor)](https://dependabot.com)
[![Dependencies](https://david-dm.org/simlu/lambda-monitor/status.svg)](https://david-dm.org/simlu/lambda-monitor)
[![Test Coverage](https://img.shields.io/coveralls/blackflux/lambda-monitor/master.svg)](https://coveralls.io/github/blackflux/lambda-monitor?branch=master)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=blackflux/lambda-monitor)](https://dependabot.com)
[![Dependencies](https://david-dm.org/blackflux/lambda-monitor/status.svg)](https://david-dm.org/blackflux/lambda-monitor)
[![NPM](https://img.shields.io/npm/v/lambda-monitor.svg)](https://www.npmjs.com/package/lambda-monitor)
[![Downloads](https://img.shields.io/npm/dt/lambda-monitor.svg)](https://www.npmjs.com/package/lambda-monitor)
[![Semantic-Release](https://github.com/blackflux/js-gardener/blob/master/assets/icons/semver.svg)](https://github.com/semantic-release/semantic-release)
Expand Down Expand Up @@ -31,7 +30,7 @@ Automatically configure lambda log analysis and popagation to external services.
Getting set up is very easy:
1) Clone repository locally with
```bash
$ git clone https://github.com/simlu/lambda-monitor
$ git clone https://github.com/blackflux/lambda-monitor
```
2) Copy `config/example.yml` to `config/STAGE.yml` for each `STAGE` (e.g. `dev`, `qa` or `prod`).
3) Configure copied files with appropriate tokens. Unused token need to be removed.
Expand All @@ -53,7 +52,7 @@ To tag log messages just prefix them with, e.g. `DEBUG:`. Default log level is `

If you decide not to enable rollbar logging please remove the token from the appropriate yml files.

> :link: For Rollbar Logging directly from Lambda Function see [lambda-rollbar](https://github.com/simlu/lambda-rollbar).
> :link: For Rollbar Logging directly from Lambda Function see [lambda-rollbar](https://github.com/blackflux/lambda-rollbar).
### Configure Log Services (All Optional)

Expand Down
3 changes: 2 additions & 1 deletion gardener.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const gardener = require('js-gardener');
if (require.main === module) {
gardener({
author: "Lukas Siemon",
docker: ["lambda"]
docker: ["lambda"],
ci: ["circle"]
}).catch(() => process.exit(1));
}
2 changes: 1 addition & 1 deletion package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/simlu/lambda-monitor.git"
"url": "https://github.com/blackflux/lambda-monitor.git"
},
"keywords": [
"aws",
Expand All @@ -34,9 +34,9 @@
"author": "Lukas Siemon",
"license": "MIT",
"bugs": {
"url": "https://github.com/simlu/lambda-monitor/issues"
"url": "https://github.com/blackflux/lambda-monitor/issues"
},
"homepage": "https://github.com/simlu/lambda-monitor#readme",
"homepage": "https://github.com/blackflux/lambda-monitor#readme",
"dependencies": {
"aws-sdk": "2.343.0",
"cfn-response": "1.0.1",
Expand Down Expand Up @@ -67,7 +67,7 @@
"licenses": [
{
"type": "MIT",
"url": "https://github.com/simlu/lambda-monitor/blob/master/LICENSE"
"url": "https://github.com/blackflux/lambda-monitor/blob/master/LICENSE"
}
],
"engines": {
Expand Down

0 comments on commit 55ddd01

Please sign in to comment.