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.

Sign up for GitHub

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

Jump to bottom

feat: Harvest should support recording and replaying HTTP requests #3235

Merged
merged 3 commits into from
Nov 4, 2024
Merged

feat: Harvest should support recording and replaying HTTP requests #3235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64cef7e
feat: Harvest should support recording and replaying HTTP requests
cgrinds Oct 28, 2024
5fd1e02
feat: Harvest should support recording and replaying HTTP requests
cgrinds Oct 29, 2024
c3fa128
feat: Harvest should support recording and replaying HTTP requests
cgrinds Oct 30, 2024
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
29 changes: 26 additions & 3 deletions cmd/collectors/keyperf/keyperf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"github.com/netapp/harvest/v2/cmd/collectors/rest"
"github.com/netapp/harvest/v2/cmd/poller/collector"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/pkg/conf"
"github.com/netapp/harvest/v2/pkg/errs"
"github.com/netapp/harvest/v2/pkg/matrix"
"github.com/netapp/harvest/v2/pkg/slogx"
Expand All @@ -20,8 +21,10 @@ const (
)

type KeyPerf struct {
*rest.Rest // provides: AbstractCollector, Client, Object, Query, TemplateFn, TemplateType
perfProp *perfProp
*rest.Rest // provides: AbstractCollector, Client, Object, Query, TemplateFn, TemplateType
perfProp *perfProp
pollDataCalls int
recordsToSave int // Number of records to save when using the recorder
}

type counter struct {
Expand Down Expand Up @@ -89,6 +92,8 @@ func (kp *KeyPerf) Init(a *collector.AbstractCollector) error {

kp.buildCounters()

kp.recordsToSave = collector.RecordKeepLast(kp.Params, kp.Logger)

kp.Logger.Debug(
"initialized cache",
slog.Int("numMetrics", len(kp.Prop.Metrics)),
Expand Down Expand Up @@ -232,7 +237,25 @@ func (kp *KeyPerf) PollData() (map[string]*matrix.Matrix, error) {
return nil, errs.New(errs.ErrConfig, "empty url")
}

perfRecords, err = kp.GetRestData(href)
kp.pollDataCalls++
if kp.pollDataCalls >= kp.recordsToSave {
kp.pollDataCalls = 0
}

var headers map[string]string

poller, err := conf.PollerNamed(kp.Options.Poller)
if err != nil {
slog.Error("failed to find poller", slogx.Err(err), slog.String("poller", kp.Options.Poller))
}

if poller.IsRecording() {
headers = map[string]string{
"From": strconv.Itoa(kp.pollDataCalls),
}
}

perfRecords, err = kp.GetRestData(href, headers)
if err != nil {
return nil, fmt.Errorf("failed to fetch href=%s %w", href, err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/collectors/rest/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,13 +677,13 @@ func (r *Rest) HandleResults(mat *matrix.Matrix, result []gjson.Result, prop *pr
return count, numPartials
}

func (r *Rest) GetRestData(href string) ([]gjson.Result, error) {
func (r *Rest) GetRestData(href string, headers ...map[string]string) ([]gjson.Result, error) {
r.Logger.Debug("Fetching data", slog.String("href", href))
if href == "" {
return nil, errs.New(errs.ErrConfig, "empty url")
}

result, err := rest.FetchAll(r.Client, href)
result, err := rest.FetchAll(r.Client, href, headers...)
if err != nil {
return r.handleError(err)
}
Expand Down
63 changes: 52 additions & 11 deletions cmd/collectors/restperf/restperf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/netapp/harvest/v2/cmd/poller/collector"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
"github.com/netapp/harvest/v2/cmd/tools/rest"
"github.com/netapp/harvest/v2/pkg/conf"
"github.com/netapp/harvest/v2/pkg/errs"
"github.com/netapp/harvest/v2/pkg/matrix"
"github.com/netapp/harvest/v2/pkg/set"
Expand Down Expand Up @@ -45,17 +46,15 @@ const (
)

var (
constituentRegex = regexp.MustCompile(`^(.*)__(\d{4})$`)
constituentRegex = regexp.MustCompile(`^(.*)__(\d{4})$`)
qosQuery = "api/cluster/counter/tables/qos"
qosVolumeQuery = "api/cluster/counter/tables/qos_volume"
qosDetailQuery = "api/cluster/counter/tables/qos_detail"
qosDetailVolumeQuery = "api/cluster/counter/tables/qos_detail_volume"
qosWorkloadQuery = "api/storage/qos/workloads"
workloadDetailMetrics = []string{"resource_latency"}
)

var qosQuery = "api/cluster/counter/tables/qos"
var qosVolumeQuery = "api/cluster/counter/tables/qos_volume"
var qosDetailQuery = "api/cluster/counter/tables/qos_detail"
var qosDetailVolumeQuery = "api/cluster/counter/tables/qos_detail_volume"
var qosWorkloadQuery = "api/storage/qos/workloads"

var workloadDetailMetrics = []string{"resource_latency"}

var qosQueries = map[string]string{
qosQuery: qosQuery,
qosVolumeQuery: qosVolumeQuery,
Expand All @@ -70,6 +69,9 @@ type RestPerf struct {
perfProp *perfProp
archivedMetrics map[string]*rest2.Metric // Keeps metric definitions that are not found in the counter schema. These metrics may be available in future ONTAP versions.
hasInstanceSchedule bool
pollInstanceCalls int
pollDataCalls int
recordsToSave int // Number of records to save when using the recorder
}

type counter struct {
Expand Down Expand Up @@ -146,6 +148,8 @@ func (r *RestPerf) Init(a *collector.AbstractCollector) error {

r.InitSchedule()

r.recordsToSave = collector.RecordKeepLast(r.Params, r.Logger)

r.Logger.Debug(
"initialized cache",
slog.Int("numMetrics", len(r.Prop.Metrics)),
Expand Down Expand Up @@ -720,7 +724,26 @@ func (r *RestPerf) PollData() (map[string]*matrix.Matrix, error) {
return nil, errs.New(errs.ErrConfig, "empty url")
}

err = rest.FetchRestPerfData(r.Client, href, &perfRecords)
r.pollDataCalls++
if r.pollDataCalls >= r.recordsToSave {
r.pollDataCalls = 0
}

var headers map[string]string

poller, err := conf.PollerNamed(r.Options.Poller)
if err != nil {
slog.Error("failed to find poller", slogx.Err(err), slog.String("poller", r.Options.Poller))
}

if poller.IsRecording() {
headers = map[string]string{
"From": strconv.Itoa(r.pollDataCalls),
}
}

err = rest.FetchRestPerfData(r.Client, href, &perfRecords, headers)

if err != nil {
return nil, fmt.Errorf("failed to fetch href=%s %w", href, err)
}
Expand Down Expand Up @@ -1475,6 +1498,24 @@ func (r *RestPerf) PollInstance() (map[string]*matrix.Matrix, error) {
}
}

r.pollInstanceCalls++
if r.pollInstanceCalls > r.recordsToSave/3 {
r.pollInstanceCalls = 0
}

var headers map[string]string

poller, err := conf.PollerNamed(r.Options.Poller)
if err != nil {
slog.Error("failed to find poller", slogx.Err(err), slog.String("poller", r.Options.Poller))
}

if poller.IsRecording() {
headers = map[string]string{
"From": strconv.Itoa(r.pollInstanceCalls),
}
}

href := rest.NewHrefBuilder().
APIPath(dataQuery).
Fields([]string{fields}).
Expand All @@ -1490,7 +1531,7 @@ func (r *RestPerf) PollInstance() (map[string]*matrix.Matrix, error) {

apiT := time.Now()
r.Client.Metadata.Reset()
records, err = rest.FetchAll(r.Client, href)
records, err = rest.FetchAll(r.Client, href, headers)
if err != nil {
return r.handleError(err, href)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/collectors/storagegrid/rest/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func New(poller *conf.Poller, timeout time.Duration, c *auth.Credentials) (*Clie
var (
client Client
httpclient *http.Client
transport *http.Transport
transport http.RoundTripper
addr string
href string
err error
Expand All @@ -102,7 +102,7 @@ func New(poller *conf.Poller, timeout time.Duration, c *auth.Credentials) (*Clie
client.baseURL = href
client.Timeout = timeout

transport, err = c.Transport(nil)
transport, err = c.Transport(nil, poller)
if err != nil {
return nil, err
}
Expand Down
12 changes: 5 additions & 7 deletions cmd/collectors/zapi/collector/zapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,21 @@ import (
"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/systemnode"
"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/volume"
"github.com/netapp/harvest/v2/cmd/collectors/zapi/plugins/workload"
"github.com/netapp/harvest/v2/cmd/poller/collector"
"github.com/netapp/harvest/v2/cmd/poller/plugin"
client "github.com/netapp/harvest/v2/pkg/api/ontapi/zapi"
"github.com/netapp/harvest/v2/pkg/conf"
"github.com/netapp/harvest/v2/pkg/errs"
"github.com/netapp/harvest/v2/pkg/matrix"
"github.com/netapp/harvest/v2/pkg/set"
"github.com/netapp/harvest/v2/pkg/slogx"
"github.com/netapp/harvest/v2/pkg/tree/node"
"github.com/netapp/harvest/v2/pkg/util"
"log/slog"
"sort"
"strconv"
"strings"
"time"

"github.com/netapp/harvest/v2/cmd/poller/collector"
"github.com/netapp/harvest/v2/pkg/errs"
"github.com/netapp/harvest/v2/pkg/matrix"
"github.com/netapp/harvest/v2/pkg/tree/node"

client "github.com/netapp/harvest/v2/pkg/api/ontapi/zapi"
)

const BatchSize = "500"
Expand Down
Loading