Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Change Log Detection in Harvest #2178

Merged
merged 29 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6b35931
feat: Change Log Detection in Harvest
rahulguptajss Jul 5, 2023
dafc899
feat: address review comments
rahulguptajss Jul 5, 2023
ae9858c
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Jul 6, 2023
06201ac
feat: change log changes
rahulguptajss Jul 6, 2023
9290797
feat: change log changes
rahulguptajss Jul 17, 2023
f3445f8
feat: change log changes
rahulguptajss Jul 17, 2023
e6404d7
feat: change log changes
rahulguptajss Jul 18, 2023
5861d25
feat: change log changes
rahulguptajss Jul 18, 2023
e1255b3
feat: address review comments
rahulguptajss Jul 18, 2023
2f6f6f7
feat: address review comments
rahulguptajss Jul 18, 2023
e40f8b9
feat: address review comments
rahulguptajss Jul 19, 2023
f14ef21
feat: address review comments
rahulguptajss Jul 20, 2023
f2c7784
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Jul 20, 2023
60d9b8f
feat: add metric count
rahulguptajss Jul 21, 2023
15dfe81
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Jul 21, 2023
6d8995c
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Jul 21, 2023
1372def
feat: add metric count
rahulguptajss Jul 21, 2023
7e38701
feat: add metric count
rahulguptajss Jul 21, 2023
400983e
feat: address review comments
rahulguptajss Jul 25, 2023
40424fa
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Aug 2, 2023
86d7411
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Aug 8, 2023
6cac8fd
Merge remote-tracking branch 'origin/main' into rg2-change-log
rahulguptajss Aug 22, 2023
7e447c8
feat: address lint errors
rahulguptajss Aug 22, 2023
f148cd3
feat: fix testcase
rahulguptajss Aug 22, 2023
b798c1b
Merge branch 'main' into rg2-change-log
rahulguptajss Aug 30, 2023
e9cfee9
feat: merge main and disable changelog by default
rahulguptajss Aug 30, 2023
218fc41
Merge branch 'main' into rg2-change-log
rahulguptajss Oct 4, 2023
a73e71f
feat: address review comments
rahulguptajss Oct 4, 2023
7f2cb52
feat: add uuid in rest volume template and move changelog matrix as l…
rahulguptajss Oct 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/collectors/zapi/plugins/aggregate/aggregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ func (a *Aggregate) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, er

// update aggregate instance label with cloud stores info
if len(a.aggrCloudStoresMap) > 0 {
for aggrUUID, aggr := range data.GetInstances() {
for uuid, aggr := range data.GetInstances() {
if !aggr.IsExportable() {
continue
}
aggr.SetLabel("cloud_stores", strings.Join(a.aggrCloudStoresMap[aggrUUID], ","))
aggr.SetLabel("cloud_stores", strings.Join(a.aggrCloudStoresMap[uuid], ","))
}
}
return nil, nil
Expand Down
5 changes: 5 additions & 0 deletions cmd/poller/collector/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/hashicorp/go-version"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/cmd/poller/plugin/aggregator"
"github.com/netapp/harvest/v2/cmd/poller/plugin/changelog"
"github.com/netapp/harvest/v2/cmd/poller/plugin/labelagent"
"github.com/netapp/harvest/v2/cmd/poller/plugin/max"
"github.com/netapp/harvest/v2/cmd/poller/plugin/metricagent"
Expand Down Expand Up @@ -211,5 +212,9 @@ func GetBuiltinPlugin(name string, abc *plugin.AbstractPlugin) plugin.Plugin {
return metricagent.New(abc)
}

if name == "ChangeLog" {
return changelog.New(abc)
}

return nil
}
311 changes: 311 additions & 0 deletions cmd/poller/plugin/changelog/change_log.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,311 @@
package changelog

import (
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/pkg/matrix"
"github.com/netapp/harvest/v2/pkg/set"
"github.com/netapp/harvest/v2/pkg/tree/yaml"
"strconv"
"time"
)

/*The changelog feature is only applicable to labels and requires a UUID for the label name to exist.
A default configuration for volume, SVM, and node is available, but the DSL can be overwritten as needed.
The shape of the change_log is specific to each label change and is only applicable to matrix collected by the collector.
*/

// Constants for ChangeLog metrics and labels
const (
changeLog = "change"
objectLabel = "object"
opLabel = "op"
create = "create"
update = "update"
del = "delete"
track = "track"
oldLabelValue = "old_value"
newLabelValue = "new_value"
indexLabel = "index"
)

// Metrics to be used in ChangeLog
var metrics = []string{
"log",
}

// ChangeLog represents the main structure of the ChangeLog plugin
type ChangeLog struct {
*plugin.AbstractPlugin
matrixName string
previousData *matrix.Matrix
changeLogMap map[string]*matrix.Matrix
changeLogConfig Entry
index int
metricsCount int
}

// Change represents a single change entry in the ChangeLog
type Change struct {
key string
object string
op string
labels map[string]string
track string
oldValue string
newValue string
time int64
}

// New initializes a new instance of the ChangeLog plugin
func New(p *plugin.AbstractPlugin) plugin.Plugin {
return &ChangeLog{AbstractPlugin: p}
}

// Init initializes the ChangeLog plugin
func (c *ChangeLog) Init() error {

// Initialize the abstract plugin
if err := c.AbstractPlugin.Init(); err != nil {
return err
}

// Initialize the changeLogMap
c.changeLogMap = make(map[string]*matrix.Matrix)

object := c.ParentParams.GetChildS("object")
c.matrixName = object.GetContentS() + "_" + changeLog

// Initialize the changeLogMatrix
if err := c.initMatrix(); err != nil {
return err
}

return c.populateChangeLogConfig()
}

// populateChangeLogConfig populates the ChangeLog configuration from the plugin parameters
func (c *ChangeLog) populateChangeLogConfig() error {
var err error
changeLogYaml, err := yaml.Dump(c.Params)
if err != nil {
return err
}

c.changeLogConfig, err = getChangeLogConfig(c.ParentParams, string(changeLogYaml), c.Logger)
if err != nil {
return err
}
return nil
}

// initMatrix initializes a new matrix with the given name
func (c *ChangeLog) initMatrix() error {
c.changeLogMap[c.matrixName] = matrix.New(c.Parent+c.matrixName, changeLog, c.matrixName)
for _, changeLogMatrix := range c.changeLogMap {
changeLogMatrix.SetExportOptions(matrix.DefaultExportOptions())
}
for _, k := range metrics {
err := matrix.CreateMetric(k, c.changeLogMap[c.matrixName])
if err != nil {
c.Logger.Warn().Err(err).Str("key", k).Msg("error while creating metric")
return err
}
}
return nil
}

// Run processes the data and generates ChangeLog instances
func (c *ChangeLog) Run(dataMap map[string]*matrix.Matrix) ([]*matrix.Matrix, error) {

data := dataMap[c.Object]
// Purge and reset data
// remove all metrics as analytics label may change over time
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
err := c.initMatrix()
if err != nil {
c.Logger.Warn().Err(err).Msg("error while init matrix")
return nil, err
}

// if this is first poll
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
if c.previousData == nil {
c.copyPreviousData(data)
return nil, nil
}

changeMat := c.changeLogMap[c.matrixName]

changeMat.SetGlobalLabels(data.GetGlobalLabels())
object := data.Object
if c.changeLogConfig.Object == "" {
c.Logger.Warn().Str("object", object).Msg("ChangeLog is not supported. Missing correct configuration")
return nil, nil
}

prevMat := c.previousData
oldInstances := set.New()
prevInstancesUUIDKey := make(map[string]string)
for key, prevInstance := range prevMat.GetInstances() {
uuid := prevInstance.GetLabel("uuid")
if uuid == "" {
c.Logger.Warn().Str("object", object).Str("key", key).Msg("missing uuid")
continue
}
prevInstancesUUIDKey[uuid] = key
oldInstances.Add(key)
}

currentTime := time.Now().Unix()

// check if prev exists
if c.previousData != nil {
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
// loop over current instances
for key, instance := range data.GetInstances() {
uuid := instance.GetLabel("uuid")
if uuid == "" {
c.Logger.Warn().Str("object", object).Str("key", key).Msg("missing uuid. ChangeLog is not supported")
continue
}

prevKey := prevInstancesUUIDKey[uuid]
if prevKey != "" {
// instance already in cache
oldInstances.Remove(prevKey)
}

prevInstance := c.previousData.GetInstance(prevKey)

if prevInstance == nil {
//instance created
change := &Change{
key: uuid + "_" + object,
object: object,
op: create,
labels: make(map[string]string),
time: currentTime,
}
c.updateChangeLogLabels(object, instance, change)
c.createChangeLogInstance(changeMat, change)
} else {
// check for any modification
cur, old := instance.GetLabels().CompareLabels(prevInstance.GetLabels(), c.changeLogConfig.Track)
if !cur.IsEmpty() {
for currentLabel, newLabel := range cur.Iter() {
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
change := &Change{
key: uuid + "_" + object + "_" + currentLabel,
object: object,
op: update,
labels: make(map[string]string),
track: currentLabel,
oldValue: old.Get(currentLabel),
newValue: newLabel,
time: currentTime,
}
c.updateChangeLogLabels(object, instance, change)
// add changed track and its old, new value
change.labels[track] = currentLabel
change.labels[oldLabelValue] = old.Get(currentLabel)
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
change.labels[newLabelValue] = newLabel
c.createChangeLogInstance(changeMat, change)
}
}
}
}
// create deleted instances change_log
for key := range oldInstances.Iter() {
prevInstance := prevMat.GetInstance(key)
uuid := prevInstance.GetLabel("uuid")
if uuid == "" {
c.Logger.Warn().Str("object", object).Str("key", key).Msg("missing uuid. ChangeLog is not supported")
continue
}
if prevInstance != nil {
change := &Change{
key: uuid + "_" + object,
object: object,
op: del,
labels: make(map[string]string),
time: currentTime,
}
c.updateChangeLogLabels(object, prevInstance, change)
c.createChangeLogInstance(changeMat, change)
} else {
c.Logger.Warn().Str("object", object).Str("key", key).Msg("missing instance")
}
}
}

var matricesArray []*matrix.Matrix
matricesArray = append(matricesArray, changeMat)

c.copyPreviousData(data)
if len(changeMat.GetInstances()) > 0 {
// The `index` variable is used to differentiate between changes to the same label in a Grafana dashboard.
// It has a value between 0 and 100 and is used in the `change_log` query as `last_over_time`.
c.index = (c.index + 1) % 100
c.Logger.Info().Int("instances", len(changeMat.GetInstances())).
Int("metrics", c.metricsCount).
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
Msg("Collected")
}

// reset metric count
c.metricsCount = 0
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved

return matricesArray, nil
}

// copyPreviousData creates a copy of the previous data for comparison
func (c *ChangeLog) copyPreviousData(cur *matrix.Matrix) {
labels := c.changeLogConfig.PublishLabels
cgrinds marked this conversation as resolved.
Show resolved Hide resolved
labels = append(labels, c.changeLogConfig.Track...)
labels = append(labels, "uuid")
c.previousData = cur.Clone(matrix.With{Data: true, Metrics: false, Instances: true, ExportInstances: false, Labels: labels})
}

// createChangeLogInstance creates a new ChangeLog instance with the given change data
func (c *ChangeLog) createChangeLogInstance(mat *matrix.Matrix, change *Change) {
cInstance, err := mat.NewInstance(change.key)
if err != nil {
c.Logger.Warn().Str("object", change.object).Str("key", change.key).Msg("error while creating instance")
return
}
// copy keys
cInstance.SetLabel(objectLabel, change.object)
cInstance.SetLabel(opLabel, change.op)
cInstance.SetLabel(indexLabel, strconv.Itoa(c.index))
for k, v := range change.labels {
cInstance.SetLabel(k, v)
}
c.metricsCount += cInstance.GetLabels().Size()
m := mat.GetMetric("log")
if m == nil {
if m, err = mat.NewMetricFloat64("log"); err != nil {
c.Logger.Warn().Err(err).Str("key", "alerts").Msg("error while creating metric")
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
return
}
}
if err = m.SetValueInt64(cInstance, change.time); err != nil {
c.Logger.Error().Err(err).Str("metric", "alerts").Msg("Unable to set value on metric")
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
return
}
}

// updateChangeLogLabels populates change log labels
func (c *ChangeLog) updateChangeLogLabels(object string, instance *matrix.Instance, change *Change) {
cl := c.changeLogConfig
if len(cl.PublishLabels) > 0 {
for _, l := range cl.PublishLabels {
labelValue := instance.GetLabel(l)
if labelValue == "" {
c.Logger.Warn().Str("object", object).Str("label", l).Msg("Missing label")
} else {
change.labels[l] = labelValue
}
}
} else if cl.includeAll {
for k := range instance.GetLabels().Iter() {
rahulguptajss marked this conversation as resolved.
Show resolved Hide resolved
change.labels[k] = instance.GetLabel(k)
}
} else {
c.Logger.Warn().Str("object", object).Msg("missing publish labels")
}
}
Loading
Loading