From 0e460d4acfdca06e6f6e45bbbefdbec63118586b Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Fri, 7 Aug 2020 09:10:31 -0400 Subject: [PATCH 1/5] Updating config to use index env var --- src/config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config.ts b/src/config.ts index ce9410f..f8cd4b4 100644 --- a/src/config.ts +++ b/src/config.ts @@ -450,7 +450,9 @@ export async function loadFabricloggerConfig(flags: CliFlags, dryRun: boolean = ), token: required('hec-token', defaults.hec?.default?.token), defaultFields: defaults.hec?.default?.defaultFields, - defaultMetadata: defaults.hec?.default?.defaultMetadata, + defaultMetadata: flags['hec-events-index'] + ? Object.assign({}, defaults.hec?.default?.defaultMetadata, { index: flags['hec-events-index'] }) + : defaults.hec?.default?.defaultMetadata, flushTime: parseDuration(defaults.hec?.default?.flushTime), gzip: defaults.hec?.default?.gzip, maxQueueEntries: defaults.hec?.default?.maxQueueEntries, From 89eb31c684e7487668dd898e947099b6fed9d7f2 Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Fri, 7 Aug 2020 10:29:45 -0400 Subject: [PATCH 2/5] Adding warning for no channels configured --- src/fabric.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fabric.ts b/src/fabric.ts index 715fe91..34f0ca9 100644 --- a/src/fabric.ts +++ b/src/fabric.ts @@ -15,7 +15,7 @@ import { ManagedResource } from '@splunkdlt/managed-resource'; import { retry, exponentialBackoff } from '@splunkdlt/async-tasks'; import { readFile } from 'fs-extra'; -const { debug, info, error } = createModuleDebug('fabric'); +const { debug, info, error, warn } = createModuleDebug('fabric'); export class FabricListener implements ManagedResource { private client: FabricClient | undefined; @@ -101,6 +101,9 @@ export class FabricListener implements ManagedResource { } } } + if (Object.keys(this.config.channels).length === 0 && Object.keys(this.config.ccevents).length === 0){ + warn('No Channels or events are configured for listening. Please update your fabriclogger.yaml config file to include channels or chaincode events to listen on.'); + } } private getChannelType(data: FabricClient.BlockData): string { From 7ffef4e631ad9cc3902b2751d57f78293ad067f7 Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Fri, 7 Aug 2020 10:50:58 -0400 Subject: [PATCH 3/5] Updating defaults for index --- defaults.fabriclogger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.fabriclogger.yaml b/defaults.fabriclogger.yaml index f6a9d60..946e6a0 100644 --- a/defaults.fabriclogger.yaml +++ b/defaults.fabriclogger.yaml @@ -25,7 +25,6 @@ hec: userAgent: fabric_logger-hec-client/$VERSION multipleMetricFormatEnabled: false waitForAvailability: 2m - index: hyperledger_logs retryWaitTime: type: exponential-backoff min: 10ms @@ -33,6 +32,7 @@ hec: defaultMetadata: host: $HOSTNAME source: fabric_logger + index: hyperledger_logs internal: flushTime: 5s defaultMetadata: From 52f532b05b20e1a0837112c3226f37975aefff09 Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Fri, 7 Aug 2020 10:52:59 -0400 Subject: [PATCH 4/5] Bumping version to 2.0.2 --- README.md | 8 ++++---- helm-chart/fabric-logger/Chart.yaml | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fff9f05..7978ab6 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Running the Fabric Logger in Docker is recommended. A sample docker-compose entr services: fabric-logger.example.com: container_name: fabric-logger.example.com - image: splunkdlt/fabric-logger:release-2.0.1 + image: splunkdlt/fabric-logger:release-2.0.2 environment: - FABRIC_KEYFILE= - FABRIC_CERTFILE= @@ -113,8 +113,8 @@ We also include a helm chart for Kubernetes deployments. First set your `values. Alternatively, if you are using `cryptogen` to generate identities, the helm chart can auto-populate secrets for you. You will need to download the helm file and untar it locally so you can copy your `crypto-config` into the director. - wget https://github.com/splunk/fabric-logger/releases/download/v1.2.0/fabric-logger-helm-v1.2.0.tgz - tar -xf fabric-logger-helm-v1.2.0.tgz + wget https://github.com/splunk/fabric-logger/releases/download/2.0.2/fabric-logger-helm-v2.0.2.tgz + tar -xf fabric-logger-helm-v2.0.2.tgz cp -R crypto-config fabric-logger/crypto-config Set the secrets section of `values.yaml` to: @@ -145,7 +145,7 @@ A `network.yaml` will automatically be generated using the secrets and channel d helm install -n fabric-logger-${PEER_NAME}-${NS} --namespace ${NS} \ -f values.yaml \ - https://github.com/splunk/fabric-logger/releases/download/v2.0.1/fabric-logger-helm-v2.0.1.tgz + https://github.com/splunk/fabric-logger/releases/download/v2.0.2/fabric-logger-helm-v2.0.2.tgz ### Kubernetes: Deleting Helm Chart diff --git a/helm-chart/fabric-logger/Chart.yaml b/helm-chart/fabric-logger/Chart.yaml index e0d8a1d..954fc05 100644 --- a/helm-chart/fabric-logger/Chart.yaml +++ b/helm-chart/fabric-logger/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "v2.0.1" +appVersion: "v2.0.2" description: A Helm chart for Splunk Connect for Hyperledger Fabric name: fabric-logger -version: v2.0.1 +version: v2.0.2 keywords: - blockchain - hyperledger diff --git a/package.json b/package.json index 3ea65a1..ab3a58e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fabric-logger", - "version": "2.0.1", + "version": "2.0.2", "description": "Hyperledger Fabric Splunk integration", "author": "splunk ", "main": "lib/index.js", From 4f6778238d7754a02c30d8bc43bda53cf60cf140 Mon Sep 17 00:00:00 2001 From: Ryan Moore Date: Fri, 7 Aug 2020 10:57:42 -0400 Subject: [PATCH 5/5] Formatting --- src/config.ts | 4 ++-- src/fabric.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/config.ts b/src/config.ts index f8cd4b4..86bf681 100644 --- a/src/config.ts +++ b/src/config.ts @@ -451,8 +451,8 @@ export async function loadFabricloggerConfig(flags: CliFlags, dryRun: boolean = token: required('hec-token', defaults.hec?.default?.token), defaultFields: defaults.hec?.default?.defaultFields, defaultMetadata: flags['hec-events-index'] - ? Object.assign({}, defaults.hec?.default?.defaultMetadata, { index: flags['hec-events-index'] }) - : defaults.hec?.default?.defaultMetadata, + ? Object.assign({}, defaults.hec?.default?.defaultMetadata, { index: flags['hec-events-index'] }) + : defaults.hec?.default?.defaultMetadata, flushTime: parseDuration(defaults.hec?.default?.flushTime), gzip: defaults.hec?.default?.gzip, maxQueueEntries: defaults.hec?.default?.maxQueueEntries, diff --git a/src/fabric.ts b/src/fabric.ts index 34f0ca9..abb4d23 100644 --- a/src/fabric.ts +++ b/src/fabric.ts @@ -101,8 +101,10 @@ export class FabricListener implements ManagedResource { } } } - if (Object.keys(this.config.channels).length === 0 && Object.keys(this.config.ccevents).length === 0){ - warn('No Channels or events are configured for listening. Please update your fabriclogger.yaml config file to include channels or chaincode events to listen on.'); + if (Object.keys(this.config.channels).length === 0 && Object.keys(this.config.ccevents).length === 0) { + warn( + 'No Channels or events are configured for listening. Please update your fabriclogger.yaml config file to include channels or chaincode events to listen on.' + ); } }