Skip to content

Commit 10fb722

Browse files
themiszamanithemiszamani
authored
Merge pull request #202 from ARGOeu/devel
Prepare release 1.3
2 parents 5565f2c + 1887763 commit 10fb722

File tree

482 files changed

+58874
-1492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

482 files changed

+58874
-1492
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ __pycache__
1818
.DS_STORE
1919
conf.cfg
2020
.pytest_cache
21+
22+
# Java related
23+
.classpath
24+
.project
25+
.settings/

‎.travis.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# Set-up a python centric enviroment in order to easily choose py version:2.7
22
# bonus: Java 7 and mvn also included
33
language: python
4-
# Target py version 2.7
4+
# Target py version 3.6
55
python:
6-
- "2.7"
6+
- "3.6"
77

88
script:
99
- pip install -r ./bin/requirements.txt
1010
- pytest
11-
- cd flink_jobs/ams_ingest_metric/ && travis_wait mvn test
12-
- cd ../batch_ar && travis_wait mvn test
13-
- cd ../batch_status && travis_wait mvn test
14-
- cd ../stream_status && travis_wait mvn test
15-
- cd ../ams_ingest_sync && travis_wait mvn test
11+
- cd flink_jobs/ams_ingest_metric/ && travis_wait mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test
12+
- cd ../batch_ar && travis_wait mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test
13+
- cd ../batch_status && travis_wait mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test
14+
- cd ../stream_status && travis_wait mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test
15+
- cd ../ams_ingest_sync && travis_wait mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test
1616

17+

‎Jenkinsfile‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
2+
pipeline {
3+
agent none
4+
options {
5+
checkoutToSubdirectory('argo-streaming')
6+
newContainerPerStage()
7+
}
8+
environment {
9+
PROJECT_DIR='argo-streaming'
10+
REQUIREMENTS="${PROJECT_DIR}/bin/requirements.txt"
11+
}
12+
stages {
13+
stage('Configuration scripts Tests') {
14+
agent {
15+
docker {
16+
image 'argo.registry:5000/epel-7-py36'
17+
args '-u jenkins:jenkins'
18+
}
19+
}
20+
steps {
21+
echo 'Testing compute engine auto configuration scripts'
22+
sh """
23+
pip3 install -r ${REQUIREMENTS} --user
24+
pytest --junit-xml=${PROJECT_DIR}/junit.xml --cov=${PROJECT_DIR} --cov-report=xml
25+
"""
26+
junit '**/junit.xml'
27+
cobertura coberturaReportFile: '**/coverage.xml'
28+
}
29+
post {
30+
always {
31+
cleanWs()
32+
}
33+
}
34+
}
35+
stage('Flink Jobs Testing & Packaging') {
36+
agent {
37+
docker {
38+
image 'argo.registry:5000/epel-7-java18'
39+
args '-u jenkins:jenkins'
40+
}
41+
}
42+
steps {
43+
echo 'Packaging & Testing Flink Jobs'
44+
sh """
45+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/stream_status/pom.xml
46+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/batch_ar/pom.xml
47+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/batch_status/pom.xml
48+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/ams_ingest_metric/pom.xml
49+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/ams_ingest_sync/pom.xml
50+
mvn clean package cobertura:cobertura -Dcobertura.report.format=xml -f ${PROJECT_DIR}/flink_jobs/status_trends/pom.xml
51+
"""
52+
junit '**/target/surefire-reports/*.xml'
53+
cobertura coberturaReportFile: '**/target/site/cobertura/coverage.xml'
54+
archiveArtifacts artifacts: '**/target/*.jar'
55+
}
56+
post {
57+
always {
58+
cleanWs()
59+
}
60+
}
61+
}
62+
}
63+
post {
64+
success {
65+
script{
66+
if ( env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'devel' ) {
67+
slackSend( message: ":rocket: New version for <$BUILD_URL|$PROJECT_DIR>:$BRANCH_NAME Job: $JOB_NAME !")
68+
}
69+
}
70+
}
71+
failure {
72+
script{
73+
if ( env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'devel' ) {
74+
slackSend( message: ":rain_cloud: Build Failed for <$BUILD_URL|$PROJECT_DIR>:$BRANCH_NAME Job: $JOB_NAME")
75+
}
76+
}
77+
}
78+
}
79+
}

‎README.md‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,3 +368,82 @@ Ingest Sync | Ingesting sync data from `{{ams-endpoint}}`/v1/projects/`{{project
368368
Batch AR | Ar Batch job for tenant:`{{tenant}}` on day:`{{day}}` using report:`{{report}}`
369369
Batch Status | Status Batch job for tenant:`{{tenant}}` on day:`{{day}}` using report:`{{report}}`
370370
Streaming Status | Streaming status using data from `{{ams-endpoint}}`/v1/projects/`{{project}}`/subscriptions/`[`{{metric_subscription}}`,`{{sync_subscription}}`]
371+
372+
## Status Trends
373+
Flink batch Job that calculate status trends for critical,warning,unknown status
374+
Job requires parameters:
375+
376+
`--yesterdayData` : file location of previous day's data
377+
`--todayData` : file location of today day's data
378+
`--N` : (optional) number of displayed top results
379+
`--mongoUri` : uri to the mongo db , to store results
380+
`--apiUri` : uri to the web-api
381+
`--key` : users's token, used for authentication
382+
`--proxy` : (optional) proxy url
383+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
384+
385+
386+
Flink batch Job that calculate flip flop trends for service endpoints metrics
387+
Job requires parameters:
388+
389+
`--yesterdayData` : file location of previous day's data
390+
`--todayData` : file location of today day's data
391+
`--N` : (optional) number of displayed top results
392+
`--mongoUri` : uri to the mongo db , to store results
393+
`--apiUri` : uri to the web-api
394+
`--key` : users's token, used for authentication
395+
`--proxy` : (optional) proxy url
396+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
397+
398+
399+
Flink batch Job that calculate flip flop trends for service endpoints
400+
Job requires parameters:
401+
402+
`--yesterdayData` : file location of previous day's data
403+
`--todayData` : file location of today day's data
404+
`--N` : (optional) number of displayed top results
405+
`--mongoUri` : uri to the mongo db , to store results
406+
`--apiUri` : uri to the web-api
407+
`--key` : users's token, used for authentication
408+
`--proxy` : (optional) proxy url
409+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
410+
411+
412+
Flink batch Job that calculate flip flop trends for service
413+
Job requires parameters:
414+
415+
`--yesterdayData` : file location of previous day's data
416+
`--todayData` : file location of today day's data
417+
`--N` : (optional) number of displayed top results
418+
`--mongoUri` : uri to the mongo db , to store results
419+
`--apiUri` : uri to the web-api
420+
`--key` : users's token, used for authentication
421+
`--proxy` : (optional) proxy url
422+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
423+
424+
425+
Flink batch Job that calculate flip flop trends for groups
426+
Job requires parameters:
427+
428+
`--yesterdayData` : file location of previous day's data
429+
`--todayData` : file location of today day's data
430+
`--N` : (optional) number of displayed top results
431+
`--mongoUri` : uri to the mongo db , to store results
432+
`--apiUri` : uri to the web-api
433+
`--key` : users's token, used for authentication
434+
`--proxy` : (optional) proxy url
435+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
436+
437+
Flink batch Job that calculate flip flop trends for all levels of groups
438+
Job requires parameters:
439+
440+
`--yesterdayData` : file location of previous day's data
441+
`--todayData` : file location of today day's data
442+
`--N` : (optional) number of displayed top results
443+
`--mongoUri` : uri to the mongo db , to store results
444+
`--apiUri` : uri to the web-api
445+
`--key` : users's token, used for authentication
446+
`--proxy` : (optional) proxy url
447+
`--clearMongo` : (optional) defines if the collections in mongo will be cleared from previous documents or not. if false or is missing collection will remain as it is
448+
449+

0 commit comments

Comments
 (0)