diff --git a/op-monitorism/global_events/monitor.go b/op-monitorism/global_events/monitor.go index a69d873..6d893db 100644 --- a/op-monitorism/global_events/monitor.go +++ b/op-monitorism/global_events/monitor.go @@ -94,7 +94,7 @@ func NewMonitor(ctx context.Context, log log.Logger, m metrics.Factory, cfg CLIC Namespace: MetricsNamespace, Name: "eventEmitted", Help: "Event monitored emitted an log", - }, []string{"nickname", "rulename", "priority", "functionName", "topics", "address", "blockNumber", "txHash"}), + }, []string{"nickname", "rulename", "priority", "functionName", "topics", "address"}), unexpectedRpcErrors: m.NewCounterVec(prometheus.CounterOpts{ Namespace: MetricsNamespace, Name: "unexpectedRpcErrors", @@ -155,13 +155,13 @@ func metricsAllEventsRegistered(globalconfig GlobalConfiguration, eventEmitted * for _, config := range globalconfig.Configuration { if len(config.Addresses) == 0 { for _, event := range config.Events { - eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), "ANY_ADDRESSES_[]", "0", "N/A").Add(0) + eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), "ANY_ADDRESSES_[]").Add(0) } continue //pass to the next config so the [] any are not displayed as metrics here. } for _, address := range config.Addresses { for _, event := range globalconfig.ReturnEventsMonitoredForAnAddressFromAConfig(address, config) { - eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), address.String(), "0", "N/A").Add(0) + eventEmitted.WithLabelValues(nickname, config.Name, config.Priority, event.Signature, event.Keccak256_Signature.Hex(), address.String()).Add(0) } } } @@ -209,10 +209,10 @@ func (m *Monitor) checkEvents(ctx context.Context) { //TODO: Ensure the logs cri } // We matched an alert! event_config := ReturnAndEventForAnTopic(vLog.Topics[0], config) - m.log.Info("Event Detected", "TxHash", vLog.TxHash.String(), "Address", vLog.Address, "Topics", vLog.Topics, "Config", config, "event_config.Signature", event_config.Signature, "event_config.Keccak256_Signature", event_config.Keccak256_Signature.Hex()) + m.log.Info("Event Detected", "TxHash", vLog.TxHash.String(), "Address", vLog.Address, "RuleName", config.Name, "CurrentBlock", latestBlockNumber.String(), "Topics", vLog.Topics, "Config", config, "event_config.Signature", event_config.Signature, "event_config.Keccak256_Signature", event_config.Keccak256_Signature.Hex()) // m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex(), vLog.Address.String(), latestBlockNumber.String(), vLog.TxHash.String()).Set(float64(1)) //inc - m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex(), vLog.Address.String(), latestBlockNumber.String(), vLog.TxHash.String()).Inc() + m.eventEmitted.WithLabelValues(m.nickname, config.Name, config.Priority, event_config.Signature, event_config.Keccak256_Signature.Hex(), vLog.Address.String()).Inc() } } }