dcaegen2/collectors/hv-ves.git
4 years agoImplement kafka consumer metrics 49/90449/5
Filip Krzywka [Tue, 25 Jun 2019 12:39:07 +0000 (14:39 +0200)]
Implement kafka consumer metrics

- bump Micrometer version 1.0.8 -> 1.1.5

Change-Id: I7a00fbf252df0f31f12f8743e8719701bd282ce2
Issue-ID: DCAEGEN2-1626
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
4 years agoAdd environment configuration to kafka consumer 27/90427/6
Filip Krzywka [Tue, 25 Jun 2019 09:32:36 +0000 (11:32 +0200)]
Add environment configuration to kafka consumer

- HV-VES-specific environment prefix moved inside HvVes modules to
allow simpler no-prefix API for other modules
- created OptionDSL for brevity

Change-Id: I2fabbda1280cc0f913f8a0a04b4a055f39ed1fae
Issue-ID: DCAEGEN2-1626
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
4 years agoImplement message counting in consumer 56/90156/8
kjaniak [Wed, 19 Jun 2019 06:39:33 +0000 (08:39 +0200)]
Implement message counting in consumer

Issue-ID: DCAEGEN2-1635
Change-Id: I2666de7bad27052d9cefa0f687ad0772d4c9a95d
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
4 years agoMerge "Expose Prometheus metrics in Kafka Consumer"
Piotr Jaszczyk [Tue, 25 Jun 2019 09:33:07 +0000 (09:33 +0000)]
Merge "Expose Prometheus metrics in Kafka Consumer"

4 years agoExpose Prometheus metrics in Kafka Consumer 98/89898/8
Jakub Dudycz [Fri, 14 Jun 2019 13:48:32 +0000 (15:48 +0200)]
Expose Prometheus metrics in Kafka Consumer

Change-Id: I9d0568a5fc296604d7ac7a45b8bbd0289b845938
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1626

4 years agoFix request interval 05/90005/2
Filip Krzywka [Mon, 17 Jun 2019 11:52:06 +0000 (13:52 +0200)]
Fix request interval

In previous implementation DistinctUntilChangedSubscriber always
requested from upstream 256 events, which resulted in immediate
256 requests to CBS.

Request amount is not configurable in other way than hard-limiting
using `limitRequest`, which limits request amount for single subscriber.
(At least in our pipeline)

To avoid multiple manual subscribes, this commit changed CbsClientAdapter
to use Mono instead of Flux for CbsRequests and repeat this Mono
conditionally. Flux inside of repeatWhen is emitting event after each
onComplete received from upstream Mono and resubscribes to it if condition
is met. This seemed like good place to put our interval mechanism, which
is always-pass condition, but condition resolving blocks for variable
duration.

Change-Id: I04d1e657ec4d82185f6f07422c25c2d2ff23e60d
Issue-ID: DCAEGEN2-1557
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
4 years agoMerge "Update docker-maven-plugin to latest version"
Piotr Jaszczyk [Fri, 14 Jun 2019 11:03:23 +0000 (11:03 +0000)]
Merge "Update docker-maven-plugin to latest version"

4 years agoCreate Kafka Consumer project stub 17/89817/2
Jakub Dudycz [Thu, 13 Jun 2019 14:51:43 +0000 (16:51 +0200)]
Create Kafka Consumer project stub

Change-Id: Ib45ca6a9ab282dab509e34f9a3d3682373d794d3
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1619

4 years agoUpdate docker-maven-plugin to latest version 99/89799/1
Jakub Dudycz [Thu, 13 Jun 2019 11:44:31 +0000 (13:44 +0200)]
Update docker-maven-plugin to latest version

Update fabric8io/docker-maven-plugin to version 0.30.0

Change-Id: I528405896443b77e521a783511898298bfd91d2e
Issue-ID: DCAEGEN2-1617
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
4 years agoRetry infinitely 38/89738/2
Filip Krzywka [Mon, 10 Jun 2019 07:02:43 +0000 (09:02 +0200)]
Retry infinitely

- changed specification to retry infinitely
- moved MDC to cbsAdapter constructor as in whole module it contains
only local context (instanceID etc.). Also permuted constructor params
to match ConfigurationProviders order
- refactored module tests as ground for future enhancements

Change-Id: Ic074b9c421b60662e5512c55c7b1dfb90ab0d2ea
Issue-ID: DCAEGEN2-1557
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
4 years agoRun container commands as non-root 01/89501/2
Filip Krzywka [Thu, 6 Jun 2019 09:24:36 +0000 (11:24 +0200)]
Run container commands as non-root

- 1410 uig/gid is arbitrary, note however that any volume mounted into
container should limit permissions to this number
- also reduced firstRequestDelay in configuration provided through
local docker-compose

Change-Id: I77eeebeec5931db5c04f8f6f24d7c6fe7a121015
Issue-ID: DCAEGEN2-1557
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
4 years agoMerge "Support CBS request interval reconfiguration"
Piotr Jaszczyk [Thu, 6 Jun 2019 05:33:46 +0000 (05:33 +0000)]
Merge "Support CBS request interval reconfiguration"

4 years agoSupport CBS request interval reconfiguration 06/88306/18
kjaniak [Wed, 22 May 2019 20:19:49 +0000 (22:19 +0200)]
Support CBS request interval reconfiguration

Change-Id: Ie8892e33b2f6a58d6076f66e6cc6a2df830dfa48
Issue-ID: DCAEGEN2-1525
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoBump Kotlin and Reactor versions 42/88842/2
Piotr Jaszczyk [Thu, 30 May 2019 08:47:53 +0000 (10:47 +0200)]
Bump Kotlin and Reactor versions

Issue-ID: DCAEGEN2-1542
Change-Id: I1b14b29a780deedc9c64bdfbded4b3b05e990279
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoEnable Kafka consumer offset committing 38/87438/1
Filip Krzywka [Fri, 10 May 2019 09:53:21 +0000 (11:53 +0200)]
Enable Kafka consumer offset committing

It appears that reactor-kafka is setting auto.commit property to false,
which makes our CSITs fail nondeterministically due to automatic reset of
consumer offset.

By acknowledging manually, we will mark every message for committing,
which will be performed according to ConsumerConfiguration.
This way, Kafka broker should persist consumer offset.

Change-Id: I0c5156ff8df9bb3341e733e50a3c6866fdd94976
Issue-ID: DCAEGEN2-1495
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoUpdate versions for El Alto release 12/87012/3
Piotr Jaszczyk [Mon, 6 May 2019 09:29:45 +0000 (11:29 +0200)]
Update versions for El Alto release

Change-Id: If86dcbf8695cc50a540fe892a4f70b3ad24ac5d1
Issue-ID: DCAEGEN2-1474
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoChange of KAFKA_ADVERTISED_LISTENERS 89/86389/1 1.1.0 4.0.0-ONAP
kjaniak [Fri, 26 Apr 2019 11:51:17 +0000 (13:51 +0200)]
Change of KAFKA_ADVERTISED_LISTENERS

Fix for DMaaP app bug

Change-Id: I05312a6b5d1acc1f7894f17d89922c508bbbd41d
Issue-ID: DCAEGEN2-1448
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoUse AAF credentials from stream definition 33/86033/7
Piotr Jaszczyk [Tue, 23 Apr 2019 09:11:45 +0000 (11:11 +0200)]
Use AAF credentials from stream definition

Change-Id: I4fc20c116c60f6e7d46215a32c33884cd957e93b
Issue-ID: DCAEGEN2-1448
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoUse SASL auth in kafka connections 84/85684/2
Filip Krzywka [Thu, 18 Apr 2019 12:27:05 +0000 (14:27 +0200)]
Use SASL auth in kafka connections

Change-Id: I55a9289901a6a44f3d07a3cf4e5a028399a5d0dc
Issue-ID: DCAEGEN2-1448
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoAdd internal modifiers to comply with new HvVesCustomRule 05/85305/4
Izabela Zawadzka [Mon, 15 Apr 2019 11:03:45 +0000 (13:03 +0200)]
Add internal modifiers to comply with new HvVesCustomRule

Change-Id: I33ad24179d05ded58f6784544be9bbdd56210720
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
Issue-ID: DCAEGEN2-1438

5 years agoMerge "Create custom rule to report public modifiers in impl"
Piotr Jaszczyk [Mon, 15 Apr 2019 10:53:53 +0000 (10:53 +0000)]
Merge "Create custom rule to report public modifiers in impl"

5 years agoCreate custom rule to report public modifiers in impl 51/85051/5
Izabela Zawadzka [Thu, 11 Apr 2019 12:27:21 +0000 (14:27 +0200)]
Create custom rule to report public modifiers in impl

Change-Id: I383ca27a835943bd2dc2508425264ad7f64c7725
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
Issue-ID: DCAEGEN2-1430

5 years agoMove cmd ssl logic to xnf-simulator 72/84872/7
Jakub Dudycz [Wed, 10 Apr 2019 13:02:01 +0000 (15:02 +0200)]
Move cmd ssl logic to xnf-simulator

Change-Id: I562acbb0b7522e6cefea2a2dc1a9e292c1227b41
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-565

5 years agoCreation of server module 99/84199/9
kjaniak [Wed, 3 Apr 2019 13:48:28 +0000 (15:48 +0200)]
Creation of server module

Issue-ID: DCAEGEN2-1390
Change-Id: I07410b16ed6566b933d5f1efa35bddb965225794
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Extract transforming logic from validator"
Piotr Jaszczyk [Fri, 12 Apr 2019 06:38:04 +0000 (06:38 +0000)]
Merge "Extract transforming logic from validator"

5 years agoMerge "Fix xnf-simulator message sending bug"
Piotr Jaszczyk [Fri, 12 Apr 2019 06:20:23 +0000 (06:20 +0000)]
Merge "Fix xnf-simulator message sending bug"

5 years agoExtract transforming logic from validator 69/84869/11
Filip Krzywka [Wed, 10 Apr 2019 09:36:48 +0000 (11:36 +0200)]
Extract transforming logic from validator

Change-Id: Ic019b1796e17d24f14f41a817af6e5ecd8c7244b
Issue-ID: DCAEGEN2-1416
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoFix xnf-simulator message sending bug 50/84850/2
Jakub Dudycz [Wed, 10 Apr 2019 10:51:14 +0000 (12:51 +0200)]
Fix xnf-simulator message sending bug

Fix bug where xnf-simulator was failing to send messages with invalid wire frame.
Generated events couldn't pass HV-VES client validatation, because they had empty payload.

Change-Id: I20fb6254e432de096acfcfb8f0a0a5f912ca08c0
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1413

5 years agoMerge "Read passwords from files"
Piotr Wielebski [Wed, 10 Apr 2019 11:59:26 +0000 (11:59 +0000)]
Merge "Read passwords from files"

5 years agoRead passwords from files 25/84825/4
Piotr Jaszczyk [Wed, 10 Apr 2019 08:32:00 +0000 (10:32 +0200)]
Read passwords from files

Key- and trust-store passwords should be read from files in order to
work with DCAE tls-init-container.

Change-Id: Ibe454663328268f33f8be25ef9ec129f1ce1d396
Issue-ID: DCAEGEN2-1412
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoUpdate development scripts 04/84504/3
Filip Krzywka [Mon, 8 Apr 2019 10:40:26 +0000 (12:40 +0200)]
Update development scripts

Change-Id: I51c6f834ea6d47d055baab81d08eb7484eebef20
Issue-ID: DCAEGEN2-1399
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Move maxPayloadSizeBytes to CollectorConfiguration"
Piotr Jaszczyk [Wed, 10 Apr 2019 09:31:15 +0000 (09:31 +0000)]
Merge "Move maxPayloadSizeBytes to CollectorConfiguration"

5 years agoMove maxPayloadSizeBytes to CollectorConfiguration 20/84120/8
Jakub Dudycz [Mon, 8 Apr 2019 12:09:16 +0000 (14:09 +0200)]
Move maxPayloadSizeBytes to CollectorConfiguration

Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1387
Change-Id: I37151a58f5244841243dc531912af2ef50ea5d3c

5 years agoAllow retrieving multiple kafka topics status 31/84331/4
Filip Krzywka [Fri, 5 Apr 2019 06:44:52 +0000 (08:44 +0200)]
Allow retrieving multiple kafka topics status

Change-Id: I5e8433873e5d594e6df9da8c4893b0f54614efae
Issue-ID: DCAEGEN2-1399
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Parse whole dynamic configuration"
Piotr Jaszczyk [Wed, 10 Apr 2019 06:23:20 +0000 (06:23 +0000)]
Merge "Parse whole dynamic configuration"

5 years agoParse whole dynamic configuration 07/84107/10
Jakub Dudycz [Mon, 8 Apr 2019 11:48:42 +0000 (13:48 +0200)]
Parse whole dynamic configuration

Change-Id: I96e4cf3ac75920ed909da9063ba0b788b55474e4
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1386

5 years agoMerge "Update SDK version to 1.1.4 release"
Piotr Wielebski [Tue, 9 Apr 2019 12:39:51 +0000 (12:39 +0000)]
Merge "Update SDK version to 1.1.4 release"

5 years agoUpdate SDK version to 1.1.4 release 14/84614/1
Piotr Jaszczyk [Tue, 9 Apr 2019 06:57:16 +0000 (08:57 +0200)]
Update SDK version to 1.1.4 release

Change-Id: I3d335f503bf3deff4b779060398478c35bcde93e
Issue-ID: DCAEGEN2-1021
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoProvide enhanced component description 07/84307/9
Piotr Jaszczyk [Fri, 5 Apr 2019 06:45:26 +0000 (08:45 +0200)]
Provide enhanced component description

Change-Id: Iaed53f9acc9cdc830b2069de6d96d5f2965d9466
Issue-ID: DCAEGEN2-1394
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoFlatten configuration structure 14/84314/6
Filip Krzywka [Fri, 5 Apr 2019 09:10:46 +0000 (11:10 +0200)]
Flatten configuration structure

Change-Id: I9a5a53f3c4cf0973d071f2bc6962016b5613972d
Issue-ID: DCAEGEN2-710
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoProvide very basic component description 09/84309/3
Piotr Jaszczyk [Fri, 5 Apr 2019 06:45:26 +0000 (08:45 +0200)]
Provide very basic component description

Change-Id: If09dd6a3be5c045be6aaa6b62f259f3dce13aa9b
Issue-ID: DCAEGEN2-1394
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoGet rid of arrow-effects usage 11/84211/2
Piotr Jaszczyk [Wed, 3 Apr 2019 13:07:22 +0000 (15:07 +0200)]
Get rid of arrow-effects usage

Also clean-up dependencies + use Kotlin BOM to force single
kotlin-stdlib on classpath.

Issue-ID: DCAEGEN2-1392
Change-Id: I447c4686707de81f35f7734255ce0b13c997c4a4
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoSimplify factory/provider logic 78/84078/1
Piotr Jaszczyk [Wed, 3 Apr 2019 10:12:17 +0000 (12:12 +0200)]
Simplify factory/provider logic

Change-Id: I59467c41e1de63ead7c190a7c8fd688e3216237a
Issue-ID: DCAEGEN2-1385
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoFix shutting down when new config received bug 77/83977/5
Piotr Jaszczyk [Tue, 2 Apr 2019 13:40:46 +0000 (15:40 +0200)]
Fix shutting down when new config received bug

When new configuration has been received and at least one client
connection has been active the collector used to shut down.

Also got rid of some more IO monad usage.

Change-Id: I7981ff388ff1264a79d722727ef3005cf39e9f0d
Issue-ID: DCAEGEN2-1382
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoAllow reuse of security passwords 56/83956/1
Filip Krzywka [Tue, 2 Apr 2019 11:01:07 +0000 (13:01 +0200)]
Allow reuse of security passwords

- moved logic of creating passwords into Validator

Change-Id: Ieabab24734250bfacea96eff2b7102465ff8ed57
Issue-ID: DCAEGEN2-1380
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge configurations 33/83733/12
Filip Krzywka [Fri, 29 Mar 2019 13:52:25 +0000 (14:52 +0100)]
Merge configurations

- changed temporarily HV-VES default log level to DEBUG as in current
implementation we are applying LogLevel defined in configuration file only
if we successfully retrieve one from configuration-module, which means
that inside of this module we are logging on default level (from logback
file). This should be fixed in future work
- reduced log level on SDK's CbsClientImpl as it's logging frequency was
too high

Change-Id: If50df18df099c34bfc36d39b045140f9b9ad87f6
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Move ConfigurationProvider to config module"
Piotr Wielebski [Mon, 1 Apr 2019 13:11:13 +0000 (13:11 +0000)]
Merge "Move ConfigurationProvider to config module"

5 years agoMove ConfigurationProvider to config module 98/83698/8
Piotr Jaszczyk [Fri, 29 Mar 2019 10:22:24 +0000 (11:22 +0100)]
Move ConfigurationProvider to config module

Change-Id: Ic6f955f4e777e06e7c7eed6e08c0cac470e9a51d
Issue-ID: DCAEGEN2-1347
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoFix subscription error in DcaeAppSimulator 30/83730/1
Izabela Zawadzka [Fri, 29 Mar 2019 13:10:07 +0000 (14:10 +0100)]
Fix subscription error in DcaeAppSimulator

Change-Id: I6548d7e6c676498988ddcdde4331385e87ee746d
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
Issue-ID: DCAEGEN2-1372

5 years agoRead HV-VES healthcheck api port from cmd line 77/83377/10
kjaniak [Thu, 28 Mar 2019 09:43:59 +0000 (10:43 +0100)]
Read HV-VES healthcheck api port from cmd line

Change-Id: I6b4680a62512ef6ba15a0454e109b19619a997a6
Issue-ID: DCAEGEN2-1364
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoMerge "Remove IO monad usage from simulators"
Piotr Jaszczyk [Fri, 29 Mar 2019 07:03:19 +0000 (07:03 +0000)]
Merge "Remove IO monad usage from simulators"

5 years agoRedefine Routing 31/82631/14
Filip Krzywka [Tue, 26 Mar 2019 13:21:02 +0000 (14:21 +0100)]
Redefine Routing

As all needed information to route messege is contained inside of
KafkaSink message, we can simply put this object as part of single Route.

Change-Id: I2e7df2e0193eb2af5283980d4d5c8df03ac94df9
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoRemove IO monad usage from simulators 40/83440/4
Izabela Zawadzka [Wed, 20 Mar 2019 13:59:24 +0000 (14:59 +0100)]
Remove IO monad usage from simulators

Change-Id: I1c470777b91230f4a44a4960ca534e4b20c1ac43
Issue-ID: DCAEGEN2-1372
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
5 years agoAdded partial config merger and updated config file format 81/83381/8
pbiniek [Fri, 15 Mar 2019 15:11:00 +0000 (16:11 +0100)]
Added partial config merger and updated config file format

Change-Id: I470d3a8b2d43f5b45d958320b620205457d1cf23
Issue-ID: DCAEGEN2-1370
Signed-off-by: Pawel Biniek <pawel.biniek@nokia.com>
5 years agoMove routing functionality inside Router 49/83349/6
Filip Krzywka [Tue, 26 Mar 2019 12:57:11 +0000 (13:57 +0100)]
Move routing functionality inside Router

- also removed Routing-DSL as it won't be needed anymore

Change-Id: Ifc7bc7641a60936b5257c0bff7a8c51dddc30687
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoRemove routing from configuration file 84/83184/5
Filip Krzywka [Mon, 25 Mar 2019 11:11:07 +0000 (12:11 +0100)]
Remove routing from configuration file

Routing should only be available from CBS.

Change-Id: Idfada36dcda4192d84a5b601907d27fe0db942ce
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoRemove dummyMode configuration option 48/83348/4
Filip Krzywka [Tue, 26 Mar 2019 12:14:09 +0000 (13:14 +0100)]
Remove dummyMode configuration option

As it's not really used by anyone and it's functionality does not bring
much value

Change-Id: I99b07e484a8494a036f1f1b07e21666e044edbdb
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoUpdate SDK usage to comply with new API 57/83357/2
Filip Krzywka [Tue, 26 Mar 2019 14:01:22 +0000 (15:01 +0100)]
Update SDK usage to comply with new API

Change-Id: Ifa5847617b7cadaadd80a82a3b279ac2beb4b258
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Use DataStream API from CBS client"
Piotr Jaszczyk [Tue, 26 Mar 2019 12:40:13 +0000 (12:40 +0000)]
Merge "Use DataStream API from CBS client"

5 years agoRevert "Read HV-VES healtcheck api port from cmd line" 39/83339/1
Piotr Jaszczyk [Tue, 26 Mar 2019 12:36:10 +0000 (12:36 +0000)]
Revert "Read HV-VES healtcheck api port from cmd line"

This reverts commit f3d3e6745328b9ec8bb68dfbfb3d3d57aa47b36f.

Change-Id: I9d8813484831483812b0f7062d39e3d031dd7083
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Issue-ID: DCAEGEN2-1364

5 years agoUse DataStream API from CBS client 29/82929/6
kjaniak [Thu, 21 Mar 2019 13:03:53 +0000 (14:03 +0100)]
Use DataStream API from CBS client

Change-Id: Ief92f793282288938c6663616e9613c6df2d8ddb
Issue-ID: DCAEGEN2-1346
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoRead HV-VES healtcheck api port from cmd line 14/83214/2
kjaniak [Fri, 22 Mar 2019 11:42:11 +0000 (12:42 +0100)]
Read HV-VES healtcheck api port from cmd line

Issue-ID: DCAEGEN2-1364
Change-Id: I17c38d7397174fadc7d382cfa3dd0b3a7f4d97ff
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoUse updated CBS Client API 13/83013/1
Piotr Jaszczyk [Fri, 22 Mar 2019 09:16:25 +0000 (10:16 +0100)]
Use updated CBS Client API

Change-Id: I476900dd81d6b23e3b35a3f93c71742efdca7a6e
Issue-ID: DCAEGEN2-1363
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoSimplify consul usage 07/82907/3
Filip Krzywka [Thu, 21 Mar 2019 10:12:17 +0000 (11:12 +0100)]
Simplify consul usage

Change-Id: I707b6c52eb356cab471215b534f1143be3e4cbae
Issue-ID: DCAEGEN2-710
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMake security keys optional with SSL disabled 05/82805/5
Filip Krzywka [Wed, 20 Mar 2019 13:53:57 +0000 (14:53 +0100)]
Make security keys optional with SSL disabled

Change-Id: I0b0dd63cb3609cddf6aa5e63cf0a0f147a0aca91
Issue-ID: DCAEGEN2-1340
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoInclude basic configuration in Docker image 00/82900/2
Piotr Jaszczyk [Thu, 21 Mar 2019 08:10:11 +0000 (09:10 +0100)]
Include basic configuration in Docker image

Makes the collector start out of the box, even without valid CBS
configuration.

Note: the basic configuration will need to be changed later.

Issue-ID: DCAEGEN2-1340
Change-Id: I3c2b502f253677e78a4f4990002e683613b8869e
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoRemove environment variables and program arguments 57/82157/10
Jakub Dudycz [Wed, 13 Mar 2019 17:44:31 +0000 (18:44 +0100)]
Remove environment variables and program arguments

- Move all command line program arguments to json file.
- Reorganize configuration classes and the way they are passed through application
- Implement HV VES configuration stream
- Create concrete configuration from partial one
- Modify main HV-VES server starting pipeline

Change-Id: I6cf874b6904ed768e4820b8132f5f760299c929e
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1340

5 years agoUse Netty HttpServer in XnfApiServer 95/82395/5
Izabela Zawadzka [Fri, 15 Mar 2019 08:43:56 +0000 (09:43 +0100)]
Use Netty HttpServer in XnfApiServer

Change-Id: I86e06bd540c961098ee11af99735a5b35ce760fd
Issue-ID: DCAEGEN2-1325
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
5 years agoExtract HV-VES configuration module 19/82019/8
Filip Krzywka [Tue, 12 Mar 2019 10:50:37 +0000 (11:50 +0100)]
Extract HV-VES configuration module

To avoid cyclic dependency between "modules trio"
configuration-core-ssl some classes from core.model were also extracted.

Change-Id: Ie11029ae3500964f67f4d72279ddd68cdb2a1f0c
Issue-ID: DCAEGEN2-1332
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoUse proper Consul version in docker-compose.yml 39/82039/1
Piotr Bocheński [Tue, 12 Mar 2019 15:01:12 +0000 (16:01 +0100)]
Use proper Consul version in docker-compose.yml

Change-Id: I90c430c15832ef85cc6ef4e197cae141f246cf7b
Issue-ID: DCAEGEN2-1302
Signed-off-by: Piotr Bocheński <piotr.bochenski@nokia.com>
5 years agoUse netty HttpServer in DcaeAppApiServer 21/81921/6
Izabela Zawadzka [Fri, 8 Mar 2019 08:14:56 +0000 (09:14 +0100)]
Use netty HttpServer in DcaeAppApiServer

Change-Id: I895ad192babd9cc40266d0bec3830fcd4b0e054b
Issue-ID: DCAEGEN2-1325
Signed-off-by: Izabela Zawadzka <izabela.zawadzka@nokia.com>
5 years agoUse CBS by means of SDK in place of Consul 93/79393/12
Filip Krzywka [Thu, 28 Feb 2019 16:33:02 +0000 (17:33 +0100)]
Use CBS by means of SDK in place of Consul

- changed IO creation in main to fix error with too early calling
changeState method on collector HealthState
- increased coverage a little with few tests
- corrected coverage-report pom file to include new modules
- temporarily changed to 1.1.4-SNAPSHOT version of sdk due to need
of new version of CBSLookup

Change-Id: Ic73b46cf881ab4fabf52bef0327b09082aa90dc6
Issue-ID: DCAEGEN2-1302
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Assure coverage is checked for all modules"
Piotr Wielebski [Mon, 11 Mar 2019 13:47:27 +0000 (13:47 +0000)]
Merge "Assure coverage is checked for all modules"

5 years agoAssure coverage is checked for all modules 38/81938/3
Piotr Jaszczyk [Mon, 11 Mar 2019 13:16:39 +0000 (14:16 +0100)]
Assure coverage is checked for all modules

Change-Id: Ia9bb6cef9154d64cfa45455e38c9fe7603a64c74
Issue-ID: DCAEGEN2-1328
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoAdded JSON config file format utils 09/79309/10
pbiniek [Wed, 27 Feb 2019 22:31:15 +0000 (23:31 +0100)]
Added JSON config file format utils

Change-Id: I97fdd72324495b4c838e44c306cbcacac6b11bc1
Signed-off-by: Pawel Biniek <pawel.biniek@nokia.com>
Issue-ID: DCAEGEN2-1323

5 years agoRemove Guava 19 dependency via protobuf-java-util 16/79716/4
Jakub Dudycz [Tue, 5 Mar 2019 14:49:04 +0000 (15:49 +0100)]
Remove Guava 19 dependency via protobuf-java-util

Change-Id: Ic11cab5bce064817a954a462b3d2eea463198bd8
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1311

5 years agoExtract module for ArgBasedConfiguration 58/79258/7
Jakub Dudycz [Wed, 27 Feb 2019 11:23:00 +0000 (12:23 +0100)]
Extract module for ArgBasedConfiguration

Change-Id: Ib11700650583378eb347451950a24c5f238382e4
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1292

5 years agoUse DCAE SDK 1.1.3 (no snapshot) 11/79611/2
Piotr Jaszczyk [Mon, 4 Mar 2019 11:51:49 +0000 (12:51 +0100)]
Use DCAE SDK 1.1.3 (no snapshot)

Issue-ID: DCAEGEN2-1069
Change-Id: I48c1011873d31254df5e99ad970dd0ff18cc4c3f
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoFix ssl related bug in xnf simulator 65/79465/5
Jakub Dudycz [Fri, 1 Mar 2019 16:39:09 +0000 (17:39 +0100)]
Fix ssl related bug in xnf simulator

Fix bug when xnf simnulator was using same SecurityKeys object instance for every new VesClient,
which resulted in fault while trying to connect to collector.

With new implementation simulator reuses same HvVesProdcuer from SDK
for every VesEvent request received and creates new Producer for every
WireFrameEvent request. This allows to continue testing cases in which
there is need to assert if connection was dropped from malicious client.

Change-Id: I5f51a58de85cccf7de6ab2392f86259502be31dd
Issue-ID: DCAEGEN2-1291
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoFix bug when xnf simulator was not sending events 47/79247/2
Jakub Dudycz [Wed, 27 Feb 2019 09:16:01 +0000 (10:16 +0100)]
Fix bug when xnf simulator was not sending events

Change-Id: I53cdf572d2df66d6021651424931a67108c482d3
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1291

5 years agoUse sdk/hvves-producer in hvves/xnf-simulator 68/78768/3
Jakub Dudycz [Tue, 19 Feb 2019 17:06:33 +0000 (18:06 +0100)]
Use sdk/hvves-producer in hvves/xnf-simulator

Change-Id: I8f493b0edd2cbaef136a22d914ad24198bb63a7f
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1253

5 years agoUse SDK/SSL in HV-VES 59/78559/5
Piotr Jaszczyk [Fri, 15 Feb 2019 11:59:26 +0000 (12:59 +0100)]
Use SDK/SSL in HV-VES

Issue-ID: DCAEGEN2-1226
Change-Id: I7cfc09001f7315c1b6f4fcf150ad631630c810ef
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoMerge "Generate VesEvents in hv-ves/message-generator"
Piotr Jaszczyk [Mon, 18 Feb 2019 13:16:37 +0000 (13:16 +0000)]
Merge "Generate VesEvents in hv-ves/message-generator"

5 years agoGenerate VesEvents in hv-ves/message-generator 52/77952/8
Jakub Dudycz [Mon, 4 Feb 2019 14:20:14 +0000 (15:20 +0100)]
Generate VesEvents in hv-ves/message-generator

- Split message generator on two specialized generators
  for VesEvent and WireFrame related message types
- Refactor whole message-generator module

Change-Id: I1266b549a9a4d27213d03e8921298deab2dacb59
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1162

5 years agoUse protobuf definitions from SDK 77/78377/4
Filip Krzywka [Wed, 13 Feb 2019 10:09:38 +0000 (11:09 +0100)]
Use protobuf definitions from SDK

Change-Id: I22163f3239769070e1e04c8d0e8f0da179069632
Issue-ID: DCAEGEN2-1218
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoAdd sdk to dependencies of XNF simulator 78/77778/4
kjaniak [Mon, 4 Feb 2019 11:52:21 +0000 (12:52 +0100)]
Add sdk to dependencies of XNF simulator

Change-Id: Ib1e96c71dcddcd5228f8d186a66c924a25e32dec
Issue-ID: DCAEGEN2-1163
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoCorrect totalConnections metric 72/76272/7
Filip Krzywka [Thu, 24 Jan 2019 10:21:26 +0000 (11:21 +0100)]
Correct totalConnections metric

In previous implementation performed healthcheck on container
was counted as client connection, because metric was notified
for every TCP channel opened. This was making this metric less useful
(to avoid saying "useless" ;) ).

- refactored NettyTcpServer trying to extract functions with logic
not so strictly related to HV-VES behavior. This also resolves
discussions in https://gerrit.onap.org/r/#/c/76274/
- some renames and methods splitting was made in attempt to make code
more readable
- hv-ves should not count connections from either "127.0.0.1" or
"localhost" to his `totalConnections` metric
- removed redundant logging by adding new methods to Logger

Change-Id: I5f10dac8dac82eafd3b0de92a7ec43f2c23b8c16
Issue-ID: DCAEGEN2-1119
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoChange Health Status when shutting down 81/76181/6
Piotr Jaszczyk [Wed, 23 Jan 2019 08:51:50 +0000 (09:51 +0100)]
Change Health Status when shutting down

Change-Id: I889c934f29d34c1211c6e07f18cb16bbe35d711f
Issue-ID: DCAEGEN2-1065
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoMitigation of unexpected hv-ves shutdown 74/76274/4
kjaniak [Thu, 24 Jan 2019 06:29:50 +0000 (07:29 +0100)]
Mitigation of unexpected hv-ves shutdown

Change-Id: I96183e2358ac10457568d223f37d69c61dfd252d
Issue-ID: DCAEGEN2-1117
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoAdd grafana to docker-compose 86/76186/1
Filip Krzywka [Wed, 23 Jan 2019 11:04:57 +0000 (12:04 +0100)]
Add grafana to docker-compose

With default HV-VES dashboards included.

Change-Id: I8c15a2d609676218dce2e63d2a0730a359abf0af
Issue-ID: DCAEGEN2-1115
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Close KafkaSender when handling SIGINT"
Piotr Wielebski [Tue, 22 Jan 2019 13:59:22 +0000 (13:59 +0000)]
Merge "Close KafkaSender when handling SIGINT"

5 years agoClose KafkaSender when handling SIGINT 16/76116/5
Piotr Jaszczyk [Tue, 22 Jan 2019 10:43:18 +0000 (11:43 +0100)]
Close KafkaSender when handling SIGINT

Closing KafkaSender should result in flushing any pending messages.

Change-Id: Ib251f5ca3527266831189df542784cc17173d8dc
Issue-ID: DCAEGEN2-1065
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoEnable percentile histograms in metrics 20/76120/2
Filip Krzywka [Tue, 22 Jan 2019 11:56:53 +0000 (12:56 +0100)]
Enable percentile histograms in metrics

To allow more precise graphing.

Change-Id: I3c498b24c01e599eec316f552e25d06d653a08bb
Issue-ID: DCAEGEN2-1107
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoFix inconsistencies with logging guideline 06/75806/2
Piotr Jaszczyk [Tue, 15 Jan 2019 10:23:35 +0000 (11:23 +0100)]
Fix inconsistencies with logging guideline

Change-Id: I527ba0b3c313d946ae979b599e87bb4267a1793d
Issue-ID: DCAEGEN2-1085
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
5 years agoMerge "Align kafka properties with VESHV_MAX_PAYLOAD_SIZE"
Piotr Jaszczyk [Thu, 10 Jan 2019 10:38:17 +0000 (10:38 +0000)]
Merge "Align kafka properties with VESHV_MAX_PAYLOAD_SIZE"

5 years agoAlign kafka properties with VESHV_MAX_PAYLOAD_SIZE 58/75458/8
kjaniak [Tue, 8 Jan 2019 12:00:37 +0000 (13:00 +0100)]
Align kafka properties with VESHV_MAX_PAYLOAD_SIZE

Change-Id: I5cbfb8a982cd1efbdf58c2c0aed71f064f7b7cb8
Issue-ID: DCAEGEN2-1066
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
5 years agoUpdate development scripts 03/75603/3
Filip Krzywka [Thu, 10 Jan 2019 06:59:56 +0000 (07:59 +0100)]
Update development scripts

This changeset is mostly follow-up after merges in DCAEGEN2-1063

- new options for hv-ves hostname and port in xnf simulations scripts
- new option for disabling SSL in xnf simulations scripts
- fail start-simulation script on not completing all simulations
- use docker-healthchecks to determine xNF simulator readiness in
development scripts
- fix logging in xNF simulator on closing connection
- minor corrections in logs and usage for development scripts

Change-Id: Ic939a139fdaf86ad487e0b31d6abcfc6c8a28885
Issue-ID: DCAEGEN2-1063
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
5 years agoMerge "Align XNF simulator batch with Netty's queue size"
Piotr Jaszczyk [Tue, 8 Jan 2019 13:33:20 +0000 (13:33 +0000)]
Merge "Align XNF simulator batch with Netty's queue size"

5 years agoMerge "Handle sigterm signal"
Piotr Wielebski [Tue, 8 Jan 2019 12:43:25 +0000 (12:43 +0000)]
Merge "Handle sigterm signal"

5 years agoHandle sigterm signal 45/75445/3
Piotr Jaszczyk [Tue, 8 Jan 2019 10:00:41 +0000 (11:00 +0100)]
Handle sigterm signal

Change-Id: If6f431bfdc42f8d53497078b18813147cad1bad0
Issue-ID: DCAEGEN2-1065
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>