From 2ca2d1a294724d8447ccb95e8f687a41cd809752 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 17 Jun 2016 09:17:52 +0100
Subject: [PATCH] [Minor] Add merge strategy for local metric configuration

---
 conf/metrics.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/metrics.conf b/conf/metrics.conf
index aa4dab022..17c060d18 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -1028,6 +1028,6 @@ metric {
         }
     }
 
-    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/metrics.conf"
+    .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/metrics.conf"
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/metrics.conf"
 }
-- 
2.39.5