Commit 1a3987e9 authored by EKbfh's avatar EKbfh

Merge branch 'nbi_add_plus_datastream' into 'microservices'

Adding NBI service
Adding restricting by IP to NBI and Datastream services

See merge request !39
parents 02eb3753 6039da2c
Pipeline #9192 failed with stages
in 47 minutes and 16 seconds
......@@ -18,7 +18,7 @@ lint:
build_centos:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/yum
......@@ -35,7 +35,7 @@ build_centos:
build_debian8:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/apt/archives
......@@ -52,7 +52,7 @@ build_debian8:
build_debian9:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/apt/archives
......@@ -69,7 +69,7 @@ build_debian9:
build_ubuntu16:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/apt/archives
......@@ -86,7 +86,7 @@ build_ubuntu16:
build_ubuntu18:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/apt/archives
......@@ -104,7 +104,7 @@ build_ubuntu18:
build_freebsd:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/pkg
......@@ -120,7 +120,7 @@ build_freebsd:
build_rhel:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/yum
......@@ -138,7 +138,7 @@ build_rhel:
build_oel7:
stage: build
image: registry.getnoc.com/infrastructure/molecule-docker:master
image: registry.getnoc.com/infrastructure/molecule-docker:ansible_2_6_5
variables:
PIP_CACHE: /root/.cache/pip
PKG_CACHE: /var/cache/yum
......
......@@ -50,6 +50,8 @@
- role: scheduler
- role: discovery
- role: bi
- role: datastream
- role: nbi
- import_playbook: additional_roles/custom/service.yml
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -570,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -861,7 +886,7 @@ all:
noc_node_debian8: {}
svc-datastream:
children:
cfg-datastream-node_debian8:
cfg-datastream-noc_node_debian8:
hosts:
noc_node_debian8: {}
svc-datastream-read: {}
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_debian8: {}
svc-nbi:
children:
cfg-nbi-noc_node_debian8:
hosts:
noc_node_debian8: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_debian8: {}
svc-nginx:
children:
cfg-nginx-noc_node_debian8:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -319,7 +324,6 @@ all:
- config:
loglevel: info
power: 2
mode: wait
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
......@@ -412,6 +416,7 @@ all:
- config:
loglevel: info
power: 2
mode: wait
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
......@@ -570,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -861,7 +886,7 @@ all:
noc_node_debian9: {}
svc-datastream:
children:
cfg-datastream-node_debian8:
cfg-datastream-noc_node_debian9:
hosts:
noc_node_debian9: {}
svc-datastream-read: {}
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_debian9: {}
svc-nbi:
children:
cfg-nbi-noc_node_debian9:
hosts:
noc_node_debian9: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_debian9: {}
svc-nginx:
children:
cfg-nginx-noc_node_debian9:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -570,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_centos7: {}
svc-nbi:
children:
cfg-nbi-noc_node_centos7:
hosts:
noc_node_centos7: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_centos7: {}
svc-nginx:
children:
cfg-nginx-noc_node_centos7:
......
......@@ -45,6 +45,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -80,6 +81,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -124,6 +126,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -571,6 +576,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -965,6 +990,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_freebsd11: {}
svc-nbi:
children:
cfg-nbi-noc_node_freebsd11:
hosts:
noc_node_freebsd11: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_freebsd11: {}
svc-nginx:
children:
cfg-nginx-noc_node_freebsd11:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -219,7 +224,6 @@ all:
noc_dc: DC
noc_env: NOC
noc_env_type: eval
noc_web_host: noc_node_oel7
noc_group: noc
noc_installation_name: Unconfigured installation
noc_python_interpreter: python
......@@ -571,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -712,6 +736,7 @@ all:
pool: null
noc_user: noc
noc_version: microservices
noc_web_host: noc_node_oel7
node_id: 1
nsqd_max_messages_in_memory: 10000
nsqd_max_msg_size: 1048576
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_oel7: {}
svc-nbi:
children:
cfg-nbi-noc_node_oel7:
hosts:
noc_node_oel7: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_oel7: {}
svc-nginx:
children:
cfg-nginx-noc_node_oel7:
......@@ -1008,7 +1042,6 @@ all:
svc-nsqlookupd-exec:
hosts:
noc_node_oel7: {}
svc-pgbouncer:
children:
cfg-pgbouncer-noc_node_oel7:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -219,7 +224,6 @@ all:
noc_dc: DC
noc_env: NOC
noc_env_type: eval
noc_web_host: noc_node_rhel7
noc_group: noc
noc_installation_name: Unconfigured installation
noc_python_interpreter: python
......@@ -571,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -712,6 +736,7 @@ all:
pool: null
noc_user: noc
noc_version: microservices
noc_web_host: noc_node_rhel7
node_id: 1
nsqd_max_messages_in_memory: 10000
nsqd_max_msg_size: 1048576
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_rhel7: {}
svc-nbi:
children:
cfg-nbi-noc_node_rhel7:
hosts:
noc_node_rhel7: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_rhel7: {}
svc-nginx:
children:
cfg-nginx-noc_node_rhel7:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -570,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_ubuntu16: {}
svc-nbi:
children:
cfg-nbi-noc_node_ubuntu16:
hosts:
noc_node_ubuntu16: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_ubuntu16: {}
svc-nginx:
children:
cfg-nginx-noc_node_ubuntu16:
......
......@@ -44,6 +44,7 @@ all:
datastream_loglevel: info
datastream_power: 2
datastream_mode: wait
datastream_whitelist_access: ""
discovery_backup_power: 1
discovery_loglevel: info
discovery_max_threads: 10
......@@ -79,6 +80,7 @@ all:
has_svc_memcached: true
has_svc_mongod: true
has_svc_mrt: true
has_svc_nbi: true
has_svc_nginx: true
has_svc_noc: true
has_svc_nsqd: true
......@@ -123,6 +125,9 @@ all:
mrt_loglevel: info
mrt_max_concurrency: 50
mrt_power: 2
nbi_loglevel: info
nbi_power: 2
nbi_whitelist_access: ""
nginx_cert: |
-----BEGIN CERTIFICATE-----
MIIFAzCCAuugAwIBAgIJAKrO/EVH/HOBMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
......@@ -570,6 +575,26 @@ all:
stopwaitsecs: 3
name: mrt
pool: null
- config:
loglevel: info
power: 2
config_order: yaml:///opt/noc/etc/tower.yml,yaml:///opt/noc/etc/settings.yml,env:///NOC
environment:
category: internal
depends:
- noc
level: global
supervisord:
command: ./services/nbi/service.py
oom_score_adj: 999
priority: 100
process_name: '%(program_name)s-%(process_num)02d'
startretries: 999
stdout_logfile_backups: 3
stdout_logfile_maxbytes: 1MB
stopwaitsecs: 3
name: nbi
pool: null
- config:
backup_power: 1
loglevel: info
......@@ -964,6 +989,15 @@ all:
svc-mrt-exec:
hosts:
noc_node_ubuntu18: {}
svc-nbi:
children:
cfg-nbi-noc_node_ubuntu18:
hosts:
noc_node_ubuntu18: {}
svc-nbi-read: {}
svc-nbi-exec:
hosts:
noc_node_ubuntu18: {}
svc-nginx:
children:
cfg-nginx-noc_node_ubuntu18:
......
......@@ -16,7 +16,7 @@ forms:
min: 0
mode:
default: wait
label: Datastrem mode
label: Datastream mode
type: list
options:
- pool
......@@ -32,6 +32,12 @@ forms:
- warning
- error
- critial
whitelist_access:
type: text
label: "Restrict access to service from IPs:"
common: environment
description: "in CIDR notation, separated with comma"
services:
datastream:
level: global
......
---
forms:
nbi:
description: >
<strong>Service type</strong>: Internal <br/>
<strong>Short description</strong>: NBI service <br/>
<strong>Long description</strong>: Service for integration in external systems<br/>
<strong>Scale Recommendations</strong>: Two per HA installation <br/>
<strong>docs</strong>: <a href=http://docs.getnoc.com/en/latest/services/nbi/ target=_blank>NBI</a><br/>
<strong>Placement constraint</strong>: On nginx <br/>
power:
default: 1
label: "Instances"
type: int
max: 8
min: 0
loglevel:
default: info
label: Loglevel
type: list
options:
- disabled
- debug
- info
- warning
- error
- critial
whitelist_access:
type: text
label: "Restrict access to service from IPs:"
common: environment
description: "in CIDR notation, separated with comma"
services:
nbi:
level: global
category: internal
supervisord:
command: "./services/nbi/service.py"