Skip to content

GHM-743 transition more platform repository to pre-gitflow branching model #87

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

Merged
merged 40 commits into from
Jul 20, 2022

Conversation

prakashsurya
Copy link
Contributor

This is a git merge of master into 6.0/stage; this is in preparation for development to be done directly on 6.0/stage instead of master.

No conflicts when doing the merge, but there is a diff with master:

± git diff origin/master
diff --git a/bpf/estat/zvol.c b/bpf/estat/zvol.c
index 23276e4..3dc170e 100644
--- a/bpf/estat/zvol.c
+++ b/bpf/estat/zvol.c
@@ -31,7 +31,6 @@
 #define    POOL (OPTARG)
 #endif
 
-
 // Structure to hold thread local data
 typedef struct {
    u64 ts;

brad-lewis and others added 30 commits November 19, 2019 14:59
* Fix backend io collector post 5.x kernel upgrade

* Check for kprobe existence before attaching

* Fix lint 1
estat: too many arguments output when there are too few
estat: remove mandatory final positional duration argument

closes #10, closes #14, and closes #16
* Fix usage message for zil program

* Fix arg parsing error message
Use copy of bcc_helper.h from performance-diagnositics
Add new tool for observing metaslab allocations
Compilation failures due to fentry issue
Throughput values are not normalized
port txg dtrace script to ebpf
brad-lewis and others added 10 commits October 1, 2021 10:24
…obecloses #45 (#68)

Co-authored-by: Brad Lewis <brad.lewis@delphix.com>
Initial addition of configuration and control files to enable
performance metric collection using the Telegraf agent.
See also IDEA-2835 : Improving Support Bundle Performance Metrics

Includes:
- Service definition and startup script for "delphix-telegraf"
- Modified version of "estat" adding JSON output via a "-j" option
- A "perf_playbook" wrapper script to enable/disable enhanced collection
- Configuration file sections (combined on startup)
- Simple wrappers to facilitate parsing of "nfs_threads", "zpool iostat -o",
and "zcache stats -a" outputs

The service starts with a "base" set of metrics, but will include Object Storage
metrics when it is detected, and will include Performance Playbook commands
if that has been enabled (manually). The config is reassembled each startup.

File paths intended:

/opt/delphix/server/bin/delphix-telegraf-service
/lib/systemd/system/delphix-telegraf.service
/etc/telegraf/nfs-threads.sh
/opt/delphix/server/bin/perf_playbook
/etc/telegraf/telegraf.base
/etc/telegraf/telegraf.inputs.dose
/etc/telegraf/telegraf.inputs.playbook
/etc/telegraf/zcache-stats.sh
/etc/telegraf/zpool-iostat-o.sh

This configuration records 4 output files (rotated on size) for main metrics,
aggregate statistics (min,max,mean,stddev) and Playbook outputs to enable
independent retention periods.
CP-8403 Adding Telegraf-based metric collection.
@prakashsurya prakashsurya changed the title Merge remote-tracking branch 'origin/master' into 6.0/stage GHM-743 transition more platform repository to pre-gitflow branching model Jul 19, 2022
@prakashsurya prakashsurya merged commit 9bbb16a into 6.0/stage Jul 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

9 participants