chore(model): add metric for total number of conflicts (#10037)
This commit is contained in:
@@ -1854,6 +1854,7 @@ func (f *sendReceiveFolder) moveForConflict(name, lastModBy string, scanChan cha
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
metricFolderConflictsTotal.WithLabelValues(f.ID).Inc()
|
||||||
newName := conflictName(name, lastModBy)
|
newName := conflictName(name, lastModBy)
|
||||||
err := f.mtimefs.Rename(name, newName)
|
err := f.mtimefs.Rename(name, newName)
|
||||||
if fs.IsNotExist(err) {
|
if fs.IsNotExist(err) {
|
||||||
|
|||||||
@@ -57,6 +57,13 @@ var (
|
|||||||
Name: "folder_processed_bytes_total",
|
Name: "folder_processed_bytes_total",
|
||||||
Help: "Total amount of data processed during folder syncing, per folder ID and data source (network/local_origin/local_other/local_shifted/skipped)",
|
Help: "Total amount of data processed during folder syncing, per folder ID and data source (network/local_origin/local_other/local_shifted/skipped)",
|
||||||
}, []string{"folder", "source"})
|
}, []string{"folder", "source"})
|
||||||
|
|
||||||
|
metricFolderConflictsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
|
||||||
|
Namespace: "syncthing",
|
||||||
|
Subsystem: "model",
|
||||||
|
Name: "folder_conflicts_total",
|
||||||
|
Help: "Total number of conflicts",
|
||||||
|
}, []string{"folder"})
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -90,4 +97,5 @@ func registerFolderMetrics(folderID string) {
|
|||||||
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceLocalOther)
|
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceLocalOther)
|
||||||
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceLocalShifted)
|
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceLocalShifted)
|
||||||
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceSkipped)
|
metricFolderProcessedBytesTotal.WithLabelValues(folderID, metricSourceSkipped)
|
||||||
|
metricFolderConflictsTotal.WithLabelValues(folderID)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user