Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
719eb89
init
May 7, 2018
e7eab31
missing configs and tokenise properly
May 8, 2018
ef9cab4
fix the problem with timestamp autamatically get mapped and break the…
May 14, 2018
c09d2f0
working aws billing logstashed
Jun 6, 2018
03f2a0b
exclude for now
imomou Jun 7, 2018
a6e1da1
exclude bill attempt to merge it with s3logstash
imomou Jun 7, 2018
43170a4
restore
imomou Jun 7, 2018
fdab46d
redundant line
imomou Jun 7, 2018
16261fd
bah
imomou Jun 7, 2018
caa9fa5
logstash for aws billing
imomou Jun 12, 2018
47a237e
missing lib
Jun 27, 2018
e85bf6d
standardise config
Jun 27, 2018
d8accb0
remove debug
Jun 27, 2018
ebaf5da
accidenly commented out tokenise part
Jun 27, 2018
7ffbed3
deleting of original payload should be last
Jul 1, 2018
56c111e
reduce the waiting for log processing time and allow user to configur…
imomou Aug 20, 2018
bf3c2bd
takeout the log4net stuff for now till I have more comprehensive solu…
imomou Aug 20, 2018
650ae6b
redundant
imomou Aug 20, 2018
7969c5a
Merge branch 'master' of https://github.com/Bit-Clouded/Angostura
Sep 18, 2018
2945f85
drop cfn logs from edge location not actuallt being served
Sep 18, 2018
475a93c
remove reduddant process
Sep 18, 2018
d93b29c
more date to handle ...
Dec 6, 2018
35db2f0
Merge branch 'master' of https://github.com/Bit-Clouded/Angostura
Sep 9, 2019
95c9af6
init for sqs logstash
Sep 9, 2019
a8964ec
init
Sep 10, 2019
e3397a8
logstash config
Sep 10, 2019
b00d4b0
rename
Sep 10, 2019
c9d0018
renamed
Sep 10, 2019
2cbd173
stuff
Sep 10, 2019
0350e12
incorrect field, refactor
Sep 10, 2019
6ae4f87
correction, indexname only allow lowercase
Sep 11, 2019
170e969
working logstash eith es
Sep 16, 2019
5877ff7
rearrange, default all to json
Sep 17, 2019
46591a6
revert back unnesarily changes
Sep 26, 2019
1a5c4d0
incorrect base image and some minor indentation issue
Sep 27, 2019
d8ca103
init cicd
Oct 15, 2019
9605ca5
incorrect depenedency
Oct 15, 2019
d92a160
incorrect file type
Oct 15, 2019
e36af08
xpack monitoring I believe is not needed at this stage
Oct 16, 2019
ea8f05a
resolve conflics
Oct 16, 2019
81599df
6.5.1 logstash doesnt work with old configuration
Mar 27, 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
23 changes: 23 additions & 0 deletions analytics/ls-aws-sqs-default/build-task.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
platform: linux
inputs:
- name: ((input))
path: ls-aws-sqs-default

run:
path: /bin/sh
dir: ls-aws-sqs-default
args:
- -c
- |
set -e
USER root

mkdir -p /bc/temp/
cd/bc/
cp ls-aws-sqs3-default.conf ./
cp entrypoint.sh ./
cp logstash.yml /usr/share/logstash/config/
chmod +x ./entrypoint.sh

outputs:
- name: bin
1 change: 0 additions & 1 deletion analytics/ls-aws-sqs-default/logstash.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
http.host: "0.0.0.0"
path.config: /usr/share/logstash/pipeline
xpack.monitoring.enabled: false
218 changes: 218 additions & 0 deletions analytics/ls-aws-sqs-default/pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
groups: []
resources:
- name: builder-task
type: registry-image
source:
repository: concourse/builder-task
- name: concourse-pipeline
type: concourse-pipeline
source:
teams:
- name: main
password: ((concourse-main-password))
username: ((concourse-main-username))
- name: container-prod-semver
type: semver
source:
access_key_id: ((aws-key-id))
bucket: ((default-cicd-bucket))
initial_version: 0.0.0
key: ls-aws-sqs-default/semver-prod-0.0
region_name: eu-west-1
secret_access_key: ((aws-key-secret))
- name: container-rc-semver
type: semver
source:
access_key_id: ((aws-key-id))
bucket: ((default-cicd-bucket))
initial_version: 0.0.0
key: ls-aws-sqs-default/semver-rc-0.0
region_name: eu-west-1
secret_access_key: ((aws-key-secret))
- name: container-test-semver
type: semver
source:
access_key_id: ((aws-key-id))
bucket: ((default-cicd-bucket))
initial_version: 0.0.0
key: ls-aws-sqs-default/semver-test-0.0
region_name: eu-west-1
secret_access_key: ((aws-key-secret))
- name: github-ls-aws-sqs-default-dockerfile
type: git
source:
paths:
- docker/*
- docker/**/*
uri: https://github.com/imomou/Angostura.git
- name: github-ls-aws-sqs-default-pipeline
type: git
source:
paths:
- analytics/ls-aws-sqs-default/pipeline.yml
uri: https://github.com/imomou/Angostura.git
- name: github-ls-aws-sqs-default-s3
type: git
source:
paths:
- analytics/ls-aws-sqs-default/*
- analytics/ls-aws-sqs-default/**/*
uri: https://github.com/imomou/Angostura.git
- name: ls-build
type: registry-image
source:
repository: docker.elastic.co/logstash
tag: logstash-oss
- name: ls-cli
type: registry-image
source:
repository: docker.elastic.co/logstash
tag: logstash-oss
- name: prod-image
type: registry-image
source:
password: ((dh-password))
repository: bitclouded/ls-aws-sqs-default
username: ((dh-username))
- name: rc-image
type: registry-image
source:
password: ((dh-password))
repository: bitcloudedci/ls-aws-sqs-default
username: ((dh-username))
- name: s3-artifact
type: s3
source:
access_key_id: ((aws-key-id))
bucket: ((default-cicd-bucket))
initial_path: ls-aws-sqs-default/s3-aaa
regexp: ls-aws-sqs-default/s3-(.*)
region_name: eu-west-1
secret_access_key: ((aws-key-secret))
- name: test-image
type: registry-image
source:
password: ((dh-password))
repository: bitcloudedci/ls-aws-sqs-default
username: ((dh-username))
resource_types:
- name: concourse-pipeline
type: docker-image
source:
repository: concourse/concourse-pipeline-resource
jobs:
- name: set-pipelines
public: true
plan:
- get: github-ls-aws-sqs-default-pipeline
trigger: true
- put: concourse-pipeline
params:
pipelines:
- config_file: github-ls-aws-sqs-default-pipeline/pipeline.yml
name: ls-aws-sqs-default
team: main
unpaused: true
- name: build-s3
public: true
plan:
- get: concourse-pipeline
passed:
- set-pipelines
- get: ls-build
- get: github-ls-aws-sqs-default-s3
trigger: true
- task: build
file: github-ls-aws-sqs-default-s3/build-task.yml
vars:
bin-name: s3
build-path: analytics/ls-aws-sqs-default
input: github-ls-aws-sqs-default-s3
image: golang-build
- put: s3-artifact
params:
acl: public-read
file: s3-*
- name: docker-build
public: true
plan:
- get: container-test-semver
params:
pre: test
- get: s3-artifact
passed:
- build-s3
trigger: true
- get: github-ls-aws-sqs-default-dockerfile
trigger: true
- get: ls-cli
params:
format: oci
- get: builder-task
- task: assemble
privileged: true
file: github-ls-aws-sqs-default-dockerfile/docker/build-task.yml
vars:
docker-semver: container-test-semver
dockerfile: github-ls-aws-sqs-default-dockerfile
repository: bitcloudedci/ls-aws-sqs-default
image: builder-task
- put: test-image
params:
additional_tags: container-test-semver/number
image: image/image.tar
- put: container-test-semver
params:
file: container-test-semver/number
- name: promote-to-rc
public: true
plan:
- get: test-image
passed:
- docker-build
params:
format: oci
- get: container-rc-semver
params:
pre: rc
- put: rc-image
params:
additional_tags: container-rc-semver/number
image: test-image/image.tar
- put: container-rc-semver
params:
file: container-rc-semver/number
- name: promote-to-release
public: true
plan:
- get: rc-image
passed:
- promote-to-rc
params:
format: oci
- get: container-rc-semver
params:
bump: final
- put: prod-image
params:
additional_tags: container-rc-semver/number
image: rc-image/image.tar
- put: container-prod-semver
params:
file: container-rc-semver/number
- put: container-prod-semver
params:
bump: patch
- name: reset-release-semvers
public: true
plan:
- get: container-prod-semver
passed:
- promote-to-release
trigger: true
- put: container-test-semver
params:
file: container-prod-semver/number
- put: container-rc-semver
params:
file: container-prod-semver/number
2 changes: 1 addition & 1 deletion analytics/ls-aws-sqs3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/logstash/logstash:6.5.1
FROM docker.elastic.co/logstash/logstash:6.1.1

USER root
RUN mkdir -p /bc/temp/
Expand Down
1 change: 1 addition & 0 deletions analytics/ls-aws-sqs3/ls-aws-sqs3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ filter {

csv {
autodetect_column_names => "true"
skip_empty_columns => "true"
}

date {
Expand Down