Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate open and closed issue in metrics #16637

Merged
merged 3 commits into from
Aug 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions models/models.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ type Statistic struct {
Counter struct {
User, Org, PublicKey,
Repo, Watch, Star, Action, Access,
Issue, Comment, Oauth, Follow,
Issue, IssueClosed, IssueOpen,
Comment, Oauth, Follow,
Mirror, Release, LoginSource, Webhook,
Milestone, Label, HookTask,
Team, UpdateTask, Attachment int64
Expand All @@ -289,7 +290,24 @@ 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))

type IssueCount struct {
Count int64
IsClosed bool
}
issueCounts := []IssueCount{}

_ = x.Select("COUNT(*) AS count, is_closed").Table("issue").GroupBy("is_closed").Find(&issueCounts)
for _, c := range issueCounts {
if c.IsClosed {
stats.Counter.IssueClosed = c.Count
} else {
stats.Counter.IssueOpen = c.Count
}
}

stats.Counter.Issue = stats.Counter.IssueClosed + stats.Counter.IssueOpen

stats.Counter.Comment, _ = x.Count(new(Comment))
stats.Counter.Oauth = 0
stats.Counter.Follow, _ = x.Count(new(Follow))
Expand Down
24 changes: 24 additions & 0 deletions modules/metrics/collector.go
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ type Collector struct {
Follows *prometheus.Desc
HookTasks *prometheus.Desc
Issues *prometheus.Desc
IssuesOpen *prometheus.Desc
zeripath marked this conversation as resolved.
Show resolved Hide resolved
IssuesClosed *prometheus.Desc
Labels *prometheus.Desc
LoginSources *prometheus.Desc
Milestones *prometheus.Desc
Expand Down Expand Up @@ -77,6 +79,16 @@ func NewCollector() Collector {
"Number of Issues",
nil, nil,
),
IssuesOpen: prometheus.NewDesc(
zeripath marked this conversation as resolved.
Show resolved Hide resolved
namespace+"issues_open",
"Number of open Issues",
nil, nil,
),
IssuesClosed: prometheus.NewDesc(
namespace+"issues_closed",
"Number of closed Issues",
nil, nil,
),
Labels: prometheus.NewDesc(
namespace+"labels",
"Number of Labels",
Expand Down Expand Up @@ -165,6 +177,8 @@ func (c Collector) Describe(ch chan<- *prometheus.Desc) {
ch <- c.Follows
ch <- c.HookTasks
ch <- c.Issues
ch <- c.IssuesOpen
zeripath marked this conversation as resolved.
Show resolved Hide resolved
ch <- c.IssuesClosed
ch <- c.Labels
ch <- c.LoginSources
ch <- c.Milestones
Expand Down Expand Up @@ -221,6 +235,16 @@ func (c Collector) Collect(ch chan<- prometheus.Metric) {
prometheus.GaugeValue,
float64(stats.Counter.Issue),
)
ch <- prometheus.MustNewConstMetric(
c.IssuesClosed,
zeripath marked this conversation as resolved.
Show resolved Hide resolved
prometheus.GaugeValue,
float64(stats.Counter.IssueClosed),
)
ch <- prometheus.MustNewConstMetric(
c.IssuesOpen,
prometheus.GaugeValue,
float64(stats.Counter.IssueOpen),
)
ch <- prometheus.MustNewConstMetric(
c.Labels,
prometheus.GaugeValue,
Expand Down