Merge branch 'master' into dependabot/go_modules/golang.org/x/net-0.23.0

annotate/cmd/annotate/main.go

@@ -52,7 +52,7 @@ func main() {
 	end := time.Now().UTC()
 	if *startFlag != "" {
 		var err error
-		start, err = time.Parse(*startFlag, timeFormat)
+		start, err = time.Parse(timeFormat, *startFlag)
 		if err != nil {
 			log.Fatalf("Failed to parse start time, expecting format like %v, got %v", timeFormat, *startFlag)
 		}

cmd/bosun/conf/notify.go

@@ -299,9 +299,7 @@ func (p *PreparedEmail) Send(c SystemConfProvider) error {
 
 	e := email.NewEmail()
 	e.From = c.GetEmailFrom()
-	for _, a := range p.To {
-		e.To = append(e.To, a)
-	}
+	e.To = append(e.To, p.To...)
 	e.Subject = p.Subject
 	e.HTML = []byte(p.Body)
 	for _, a := range p.Attachments {

cmd/bosun/sched/host.go

@@ -415,9 +415,7 @@ func (s *Schedule) Host(filter string) (map[string]*HostData, error) {
 						if err != nil {
 							slog.Errorf("error unmarshalling addresses for host %s, interface %s while generating host api: %s", host.Name, m.Tags["iface"], err)
 						}
-						for _, address := range addresses {
-							iface.IPAddresses = append(iface.IPAddresses, address)
-						}
+						iface.IPAddresses = append(iface.IPAddresses, addresses...)
 					}
 				case "cdpCacheEntries":
 					if iface != nil {

cmd/bosun/sched/notify.go

@@ -251,9 +251,7 @@ func (s *Schedule) ActionNotify(at models.ActionType, user, message string, aks
 			}
 		} else {
 			incidents := []*models.IncidentState{}
-			for _, state := range states {
-				incidents = append(incidents, state)
-			}
+			incidents = append(incidents, states...)
 			not.NotifyAction(at, groupKey.template, s.SystemConf, incidents, user, message, s.RuleConf)
 		}
 	}

cmd/bosun/sched/sched.go

@@ -305,9 +305,7 @@ func (states States) GroupSets(minGroup int) map[string]models.AlertKeys {
 	for a, aks := range groupedByAlert {
 		if len(aks) >= minGroup {
 			group := models.AlertKeys{}
-			for _, ak := range aks {
-				group = append(group, ak)
-			}
+			group = append(group, aks...)
 			groups[a] = group
 		}
 	}

cmd/scollector/collectors/aws.go

@@ -112,9 +112,7 @@ func awsGetInstances(ecc ec2.EC2) ([]*ec2.Instance, error) {
 		return nil, fmt.Errorf("unable to describe EC2 Instances")
 	}
 	for _, reservation := range resp.Reservations {
-		for _, instance := range reservation.Instances {
-			instancelist = append(instancelist, instance)
-		}
+		instancelist = append(instancelist, reservation.Instances...)
 	}
 	return instancelist, nil
 }
@@ -125,9 +123,7 @@ func awsGetLoadBalancers(lb elb.ELB) ([]*elb.LoadBalancerDescription, error) {
 	if err != nil {
 		return nil, fmt.Errorf("unable to describe ELB Balancers")
 	}
-	for _, loadBalancer := range resp.LoadBalancerDescriptions {
-		lbList = append(lbList, loadBalancer)
-	}
+	lbList = append(lbList, resp.LoadBalancerDescriptions...)
 	return lbList, nil
 }
 

cmd/tsdbrelay/denormalize/denormalization.go

@@ -37,9 +37,7 @@ func ParseDenormalizationRules(config string) (map[string]*DenormalizationRule,
 			return nil, fmt.Errorf("Denormalization rules must have at least one tag name specified.")
 		}
 		rule := &DenormalizationRule{Metric: parts[0]}
-		for _, part := range parts[1:] {
-			rule.TagNames = append(rule.TagNames, part)
-		}
+		rule.TagNames = append(rule.TagNames, parts[1:]...)
 		log.Println("Denormalizing", rule)
 		m[rule.Metric] = rule
 	}

docs/index.md

@@ -20,11 +20,9 @@ order: 1
 <div class="row">
 	<div class="col-md-12">
 		<div class="admonition tip">
-				<p class="admonition-title">Project Status (2019-11)</p>
-				<p><a href="https://skyscanner.net">Skyscanner</a> is delighted to announce that as of 18th November 2019, we'll be officially taking over Bosun's ownership and maintainership from <a href="http://stackexchange.com">Stack Exchange</a> (home of stackoverflow.com).</p>
-                <p>We would like to thank StackExchange for their time, ensuring a smooth transition process, and for everyone’s hard work and input towards making this project a success. A special thanks to Kyle Brandt for initiating the Bosun project and leading it for many years.
-                 </p>
-                 <p> We will continue to welcome the open-source community code contributions on this project. Look out for updates on our plans and next steps in the near future.</p>
+			<p class="admonition-title">Project Status (2024-05)</p>
+			<p>Skyscanner is in the process of migrating from an open source monitoring solution to a SaaS vendor. We are looking for users or contributors interested in becoming maintainers. Please see <a href="https://github.com/bosun-monitor/bosun/issues/2517">this Github issue</a> for more information.
+			</p>
 		</div>
 	</div>
 </div>