Skip to content

Commit 853f1d4

Browse files
fa-at-pulsitfa-at-pulsit
authored
missed config params added (#26)
On-behalf-of: SAP <filipp.akinfiev@clyso.com> Signed-off-by: Filipp Akinfiev <filipp.akinfiev@clyso.com>
1 parent e1543c8 commit 853f1d4

2 files changed

Lines changed: 46 additions & 19 deletions

File tree

‎pkg/commands/producer_ops_log.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ var (
4646
opsTrackLatencyByBucket bool
4747
opsTrackLatencyByMethod bool
4848
opsTrackLatencyByTenant bool
49+
opsTrackBytesSentByUser bool
50+
opsTrackBytesReceivedByUser bool
51+
opsTrackBytesSentByBucket bool
52+
opsTrackBytesReceivedByBucket bool
4953
)
5054

5155
var opsLogCmd = &cobra.Command{
@@ -85,6 +89,10 @@ Following this configuration change, the RadosGW will log operations to the file
8589
TrackRequestsByIP: opsTrackRequestsByIP,
8690
TrackBytesSentByIP: opsTrackBytesSentByIP,
8791
TrackBytesReceivedByIP: opsTrackBytesReceivedByIP,
92+
TrackBytesSentByUser: opsTrackBytesSentByUser,
93+
TrackBytesReceivedByUser: opsTrackBytesReceivedByUser,
94+
TrackBytesSentByBucket: opsTrackBytesSentByBucket,
95+
TrackBytesReceivedByBucket: opsTrackBytesReceivedByBucket,
8896
TrackErrorsByIP: opsTrackErrorsByIP,
8997
TrackErrorsByUser: opsTrackErrorsByUser,
9098
TrackRequestsByIPBucketMethodTenant: opsTrackRequestsByIPBucketMethodTenant,
@@ -139,6 +147,10 @@ Following this configuration change, the RadosGW will log operations to the file
139147
event.Bool("track_requests_by_ip", config.MetricsConfig.TrackRequestsByIP)
140148
event.Bool("track_bytes_sent_by_ip", config.MetricsConfig.TrackBytesSentByIP)
141149
event.Bool("track_bytes_received_by_ip", config.MetricsConfig.TrackBytesReceivedByIP)
150+
event.Bool("track_bytes_sent_by_user", config.MetricsConfig.TrackBytesSentByUser)
151+
event.Bool("track_bytes_received_by_user", config.MetricsConfig.TrackBytesReceivedByUser)
152+
event.Bool("track_bytes_sent_by_bucket", config.MetricsConfig.TrackBytesSentByBucket)
153+
event.Bool("track_bytes_received_by_bucket", config.MetricsConfig.TrackBytesReceivedByBucket)
142154
event.Bool("track_errors_by_ip", config.MetricsConfig.TrackErrorsByIP)
143155
event.Bool("track_errors_by_user", config.MetricsConfig.TrackErrorsByUser)
144156
event.Bool("track_requests_by_method", config.MetricsConfig.TrackRequestsByMethod)
@@ -185,6 +197,10 @@ func mergeOpsLogConfigWithEnv(cfg opslog.OpsLogConfig) opslog.OpsLogConfig {
185197
cfg.MetricsConfig.TrackRequestsByIP = getEnvBool("TRACK_REQUESTS_BY_IP", cfg.MetricsConfig.TrackRequestsByIP)
186198
cfg.MetricsConfig.TrackBytesSentByIP = getEnvBool("TRACK_BYTES_SENT_BY_IP", cfg.MetricsConfig.TrackBytesSentByIP)
187199
cfg.MetricsConfig.TrackBytesReceivedByIP = getEnvBool("TRACK_BYTES_RECEIVED_BY_IP", cfg.MetricsConfig.TrackBytesReceivedByIP)
200+
cfg.MetricsConfig.TrackBytesSentByUser = getEnvBool("TRACK_BYTES_SENT_BY_USER", cfg.MetricsConfig.TrackBytesSentByUser)
201+
cfg.MetricsConfig.TrackBytesReceivedByUser = getEnvBool("TRACK_BYTES_RECEIVED_BY_USER", cfg.MetricsConfig.TrackBytesReceivedByUser)
202+
cfg.MetricsConfig.TrackBytesSentByBucket = getEnvBool("TRACK_BYTES_SENT_BY_BUCKET", cfg.MetricsConfig.TrackBytesSentByBucket)
203+
cfg.MetricsConfig.TrackBytesReceivedByBucket = getEnvBool("TRACK_BYTES_RECEIVED_BY_BUCKET", cfg.MetricsConfig.TrackBytesReceivedByBucket)
188204
cfg.MetricsConfig.TrackErrorsByIP = getEnvBool("TRACK_ERRORS_BY_IP", cfg.MetricsConfig.TrackErrorsByIP)
189205
cfg.MetricsConfig.TrackErrorsByUser = getEnvBool("TRACK_ERRORS_BY_USER", cfg.MetricsConfig.TrackErrorsByUser)
190206
cfg.MetricsConfig.TrackRequestsByMethod = getEnvBool("TRACK_REQUESTS_BY_METHOD", cfg.MetricsConfig.TrackRequestsByMethod)
@@ -222,6 +238,10 @@ func init() {
222238
opsLogCmd.Flags().BoolVar(&opsTrackRequestsByIP, "track-requests-by-ip", false, "Track requests by IP")
223239
opsLogCmd.Flags().BoolVar(&opsTrackBytesSentByIP, "track-bytes-sent-by-ip", false, "Track bytes sent by IP")
224240
opsLogCmd.Flags().BoolVar(&opsTrackBytesReceivedByIP, "track-bytes-received-by-ip", false, "Track bytes received by IP")
241+
opsLogCmd.Flags().BoolVar(&opsTrackBytesSentByUser, "track-bytes-sent-by-user", false, "Track bytes sent per user")
242+
opsLogCmd.Flags().BoolVar(&opsTrackBytesReceivedByUser, "track-bytes-received-by-user", false, "Track bytes received per user")
243+
opsLogCmd.Flags().BoolVar(&opsTrackBytesSentByBucket, "track-bytes-sent-by-bucket", false, "Track bytes sent per bucket")
244+
opsLogCmd.Flags().BoolVar(&opsTrackBytesReceivedByBucket, "track-bytes-received-by-bucket", false, "Track bytes received per bucket")
225245
opsLogCmd.Flags().BoolVar(&opsTrackErrorsByIP, "track-errors-by-ip", false, "Track errors by IP")
226246
opsLogCmd.Flags().BoolVar(&opsTrackErrorsByUser, "track-errors-by-user", false, "Track errors per user")
227247
opsLogCmd.Flags().BoolVar(&opsTrackRequestsByMethod, "track-requests-by-method", false, "Track requests by HTTP method")

‎pkg/producers/opslog/README.md‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,32 @@ prysm local-producer ops-log [flags]
5757

5858
#### Metric Toggle Environment Variables:
5959

60-
| Variable | Description |
61-
|-----------------------------------------|-------------|
62-
| `TRACK_REQUESTS_BY_IP` | Track requests per IP. |
63-
| `TRACK_BYTES_SENT_BY_IP` | Track bytes sent per IP. |
64-
| `TRACK_BYTES_RECEIVED_BY_IP` | Track bytes received per IP. |
65-
| `TRACK_ERRORS_BY_IP` | Track HTTP errors per IP. |
66-
| `TRACK_ERRORS_BY_USER` | Track HTTP errors per user. |
67-
| `TRACK_ERRORS_BY_BUCKET` | Track errors per bucket. |
68-
| `TRACK_ERRORS_BY_STATUS` | Track errors by HTTP status code. |
69-
| `TRACK_REQUESTS_BY_METHOD` | Track requests per HTTP method. |
70-
| `TRACK_REQUESTS_BY_OPERATION` | Track requests per operation. |
71-
| `TRACK_REQUESTS_BY_STATUS` | Track requests by HTTP status. |
72-
| `TRACK_REQUESTS_BY_BUCKET` | Track requests per bucket. |
73-
| `TRACK_REQUESTS_BY_USER` | Track requests per user. |
74-
| `TRACK_REQUESTS_BY_TENANT` | Track requests per tenant. |
75-
| `TRACK_REQUESTS_BY_IP_BUCKET_METHOD_TENANT` | Track requests per IP, bucket, HTTP method and tenant. |
76-
| `TRACK_LATENCY_BY_USER` | Track latency per user. |
77-
| `TRACK_LATENCY_BY_BUCKET` | Track latency per bucket. |
78-
| `TRACK_LATENCY_BY_TENANT` | Track latency per tenant. |
60+
| Variable | Description |
61+
|-----------------------------------------------|----------------------------------------------------------------|
62+
| `TRACK_REQUESTS_BY_IP` | Track requests per IP. |
63+
| `TRACK_BYTES_SENT_BY_IP` | Track bytes sent per IP. |
64+
| `TRACK_BYTES_RECEIVED_BY_IP` | Track bytes received per IP. |
65+
| `TRACK_BYTES_SENT_BY_USER` | Track bytes sent per user. |
66+
| `TRACK_BYTES_RECEIVED_BY_USER` | Track bytes received per user. |
67+
| `TRACK_BYTES_SENT_BY_BUCKET` | Track bytes sent per bucket. |
68+
| `TRACK_BYTES_RECEIVED_BY_BUCKET` | Track bytes received per bucket. |
69+
| `TRACK_ERRORS_BY_IP` | Track HTTP errors per IP. |
70+
| `TRACK_ERRORS_BY_USER` | Track HTTP errors per user. |
71+
| `TRACK_ERRORS_BY_BUCKET` | Track errors per bucket. |
72+
| `TRACK_ERRORS_BY_STATUS` | Track errors by HTTP status code. |
73+
| `TRACK_REQUESTS_BY_METHOD` | Track requests per HTTP method. |
74+
| `TRACK_REQUESTS_BY_OPERATION` | Track requests per operation. |
75+
| `TRACK_REQUESTS_BY_STATUS` | Track requests by HTTP status. |
76+
| `TRACK_REQUESTS_BY_BUCKET` | Track requests per bucket. |
77+
| `TRACK_REQUESTS_BY_USER` | Track requests per user. |
78+
| `TRACK_REQUESTS_BY_TENANT` | Track requests per tenant. |
79+
| `TRACK_REQUESTS_BY_IP_BUCKET_METHOD_TENANT` | Track requests per IP, bucket, HTTP method and tenant. |
80+
| `TRACK_LATENCY_BY_USER` | Track latency per user. |
81+
| `TRACK_LATENCY_BY_BUCKET` | Track latency per bucket. |
82+
| `TRACK_LATENCY_BY_TENANT` | Track latency per tenant. |
83+
| `TRACK_LATENCY_BY_METHOD` | Track latency per HTTP method. |
84+
| `TRACK_LATENCY_BY_BUCKET_AND_METHOD` | Track latency by bucket and method combination. |
85+
7986

8087
## Metrics Collected
8188

0 commit comments

Comments
 (0)