Merge pull request #53 from splunk/rmoore/fix-index-config

Rmoore/fix index config
splunk · Aug 7, 2020 · 9a30dc9 · 9a30dc9
2 parents f6b33e0 + 4f67782
commit 9a30dc9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git 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=<path to private key file>
                 - FABRIC_CERTFILE=<path to signed certificate>
@@ -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/defaults.fabriclogger.yaml b/defaults.fabriclogger.yaml
@@ -25,14 +25,14 @@ hec:
         userAgent: fabric_logger-hec-client/$VERSION
         multipleMetricFormatEnabled: false
         waitForAvailability: 2m
-        index: hyperledger_logs
         retryWaitTime:
             type: exponential-backoff
             min: 10ms
             max: 3m
         defaultMetadata:
             host: $HOSTNAME
             source: fabric_logger
+            index: hyperledger_logs
     internal:
         flushTime: 5s
         defaultMetadata:

diff --git 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
@@ -1,6 +1,6 @@
 {
   "name": "fabric-logger",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Hyperledger Fabric Splunk integration",
   "author": "splunk <blockchain@splunk.com>",
   "main": "lib/index.js",

diff --git 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,

diff --git 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,11 @@ 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 {