Separate open and closed issue in metrics

Author: romdum

models/models.go

@@ -272,7 +272,7 @@ type Statistic struct {
 	Counter struct {
 		User, Org, PublicKey,
 		Repo, Watch, Star, Action, Access,
-		Issue, Comment, Oauth, Follow,
+		IssueClosed, IssueOpen, Comment, Oauth, Follow,
 		Mirror, Release, LoginSource, Webhook,
 		Milestone, Label, HookTask,
 		Team, UpdateTask, Attachment int64
@@ -289,7 +289,8 @@ func GetStatistic() (stats Statistic) {
 	stats.Counter.Star, _ = x.Count(new(Star))
 	stats.Counter.Action, _ = x.Count(new(Action))
 	stats.Counter.Access, _ = x.Count(new(Access))
-	stats.Counter.Issue, _ = x.Count(new(Issue))
+	stats.Counter.IssueClosed, _ = x.Where("is_closed=?", true).Count(new(Issue))
+	stats.Counter.IssueOpen, _ = x.Where("is_closed=?", false).Count(new(Issue))
 	stats.Counter.Comment, _ = x.Count(new(Comment))
 	stats.Counter.Oauth = 0
 	stats.Counter.Follow, _ = x.Count(new(Follow))

modules/metrics/collector.go

@@ -21,7 +21,8 @@ type Collector struct {
 	Comments      *prometheus.Desc
 	Follows       *prometheus.Desc
 	HookTasks     *prometheus.Desc
-	Issues        *prometheus.Desc
+	IssuesOpen    *prometheus.Desc
+	IssuesClosed  *prometheus.Desc
 	Labels        *prometheus.Desc
 	LoginSources  *prometheus.Desc
 	Milestones    *prometheus.Desc
@@ -72,9 +73,14 @@ func NewCollector() Collector {
 			"Number of HookTasks",
 			nil, nil,
 		),
-		Issues: prometheus.NewDesc(
-			namespace+"issues",
-			"Number of Issues",
+		IssuesOpen: prometheus.NewDesc(
+			namespace+"issues_open",
+			"Number of open Issues",
+			nil, nil,
+		),
+		IssuesClosed: prometheus.NewDesc(
+			namespace+"issues_closed",
+			"Number of closed Issues",
 			nil, nil,
 		),
 		Labels: prometheus.NewDesc(
@@ -164,7 +170,8 @@ func (c Collector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- c.Comments
 	ch <- c.Follows
 	ch <- c.HookTasks
-	ch <- c.Issues
+	ch <- c.IssuesOpen
+	ch <- c.IssuesClosed
 	ch <- c.Labels
 	ch <- c.LoginSources
 	ch <- c.Milestones
@@ -217,9 +224,14 @@ func (c Collector) Collect(ch chan<- prometheus.Metric) {
 		float64(stats.Counter.HookTask),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.Issues,
+		c.IssuesClosed,
+		prometheus.GaugeValue,
+		float64(stats.Counter.IssueClosed),
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.IssuesOpen,
 		prometheus.GaugeValue,
-		float64(stats.Counter.Issue),
+		float64(stats.Counter.IssueOpen),
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.Labels,