ocp-correctness #45
ocp-correctness #45
Conversation
Codecov Report
@@ Coverage Diff @@
## main #45 +/- ##
=======================================
Coverage ? 42.80%
=======================================
Files ? 25
Lines ? 1203
Branches ? 0
=======================================
Hits ? 515
Misses ? 659
Partials ? 29
Flags with carried forward coverage won't be shown. Click here to find out more. Continue to review full report at Codecov.
|
| @@ -20,6 +20,7 @@ FL2M_BIN_FILE=flowlogs2metrics | |||
| CG_BIN_FILE=confgenerator | |||
| NETFLOW_GENERATOR=nflow-generator | |||
| CMD_DIR=./cmd/ | |||
| FL2M_CONF_FILE ?= contrib/kubernetes/flowlogs2metrics.conf.yaml | |||
There was a problem hiding this comment.
using this FL2M_CONF_FILE as the name for the configuration file: This is used twice in the makefile + this allows us to deploy with different file than the default.
| @@ -58,7 +59,7 @@ lint: $(GOLANGCI_LINT) ## Lint the code | |||
| .PHONY: build_code | |||
| build_code: validate_go lint | |||
| @go mod vendor | |||
| go build "${CMD_DIR}${FL2M_BIN_FILE}" | |||
| VERSION=$$(date); go build -ldflags "-X 'main.Version=$$VERSION'" "${CMD_DIR}${FL2M_BIN_FILE}" | |||
There was a problem hiding this comment.
Adding the data as the Version variable in the main package ... we use that to report version when we start flowlogs 2metrics
There was a problem hiding this comment.
Adding a version number to flowlogs2 metrics is a-bit beyond the title of this PR but I really needed that because I changed the code all the time, and the version (in this case the compile time ) is very useful to know what image you are using old or now, etc,.
| configAsJSON, _ := json.MarshalIndent(config.Opt, "", "\t") | ||
| log.Infof("configuration:\n%s\n", configAsJSON) | ||
| configAsJSON, _ := json.MarshalIndent(config.Opt, "", " ") | ||
| fmt.Printf("Using configuration:\n%s\n", configAsJSON) |
There was a problem hiding this comment.
Moving this to be printf so we can always get this even if debug is in error (very useful for Palmetto)
| @@ -155,7 +156,7 @@ func run() { | |||
| ) | |||
|
|
|||
| // Starting log message | |||
| log.Infof("starting %s", filepath.Base(os.Args[0])) | |||
| fmt.Printf("%s starting - version [%s]\n\n", filepath.Base(os.Args[0]), Version) | |||
There was a problem hiding this comment.
Reporting version number on start up (this is seen in the container when we run flowlogs2metrics)
Moving this to be printf so we can always get this even if debug is in error (very useful for Palmetto)
| @@ -13,13 +13,14 @@ COPY cmd/ cmd/ | |||
| COPY pkg/ pkg/ | |||
|
|
|||
| # Build | |||
| RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on GOARCH=amd64 go build ./cmd/flowlogs2metrics | |||
| RUN VERSION=$(date); CGO_ENABLED=0 GOOS=linux GO111MODULE=on GOARCH=amd64 go build -ldflags "-X 'main.Version=$VERSION'" ./cmd/flowlogs2metrics | |||
There was a problem hiding this comment.
Adding version when we compile the docker image (same as when we compile manually in the makefile)
| @@ -173,7 +173,7 @@ pipeline: | |||
| - srcK8S_Namespace | |||
| - srcK8S_Type | |||
| operation: sum | |||
| recordkey: Bytes | |||
| recordkey: bytes | |||
There was a problem hiding this comment.
Small bug -- using need to use bytes and not Bytes we convert this in the generic transform
| @@ -1,5 +1,5 @@ | |||
| # This file was generated automatically by flowlogs2metrics confgenerator | |||
| log-level: debug | |||
| log-level: error | |||
There was a problem hiding this comment.
I feel that we are good to work in error level now ... :-)
| echo "Use: kubectl logs -l app=flowlogs2metrics | grep pod-to-pod-workload" | ||
| } | ||
|
|
||
| main |
There was a problem hiding this comment.
This is the main file of this PR ... it adds a test that deploys ingress, egress, and pod-to-pod in OCP and then deploys flowlogs2metrics to be able to see the flow-logs ... this is done without any aggregation. Just the pure raw flow logs (after we add k8s info to the logs)
| @@ -25,7 +25,7 @@ import ( | |||
|
|
|||
| func (cg *ConfGen) generateFlowlogs2MetricsConfig(fileName string) error { | |||
| config := map[string]interface{}{ | |||
| "log-level": "debug", // TODO: remove this temporal debug statement | |||
There was a problem hiding this comment.
Yes, ready for error level :-)
| @@ -28,7 +30,7 @@ type writeStdout struct { | |||
| func (t *writeStdout) Write(in []interface{}) { | |||
| log.Debugf("entering writeStdout Write") | |||
| for _, v := range in { | |||
| log.Infof("%v", v) | |||
| fmt.Printf("%s: %v\n", time.Now().Format(time.StampMilli), v) | |||
There was a problem hiding this comment.
When we work with stdout it is not connected to log level we just want to print the output to stdout
No description provided.