Merge branch 'main' of github.com:elastic/elastic-agent into feat/rel…

…ax-server
elastic · Oct 27, 2023 · 2ee0b57 · 2ee0b57
2 parents 7439e99 + 910d17b
commit 2ee0b57
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/...698259940-Increase-wait-period-between-service-restarts-on-failure-to-15s-on-Windows.yaml b/...698259940-Increase-wait-period-between-service-restarts-on-failure-to-15s-on-Windows.yaml
@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: Increase wait period between service restarts on failure to 15s on Windows.
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+description: This is the same value used by other Elastic windows services like endpoint-security.
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: "elastic-agent"
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: https://github.com/owner/repo/1234
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234
diff --git a/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl b/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl
@@ -57,12 +57,10 @@ resources:
 
 # List of project maintainers
 maintainers:
-  - email: "nassim.kammah@elastic.co"
-    name: "Nassim Kammah"
-    username: "nassim.kammah"
-  - email: "ivan.fernandez@elastic.co"
-    name: "Ivan Fernandez Calvo"
-    username: "ivan.fernandez"
-  - email: "victor.martinez@elastic.co"
-    name: "Victor Martinez"
-    username: "victor.martinez"
+  - email: "vincent.lind@elastic.co"
+    name: "Julien lind"
+    username: "julien.lind"
+  - email: "pierre.hilbert@elastic.co"
+    name: "pierre hilbert"
+    username: "pierre.hilbert"
+
diff --git a/internal/pkg/agent/install/svc.go b/internal/pkg/agent/install/svc.go
@@ -49,7 +49,7 @@ func newService(topPath string) (service.Service, error) {
 
 			// Windows setup restart on failure
 			"OnFailure":              "restart",
-			"OnFailureDelayDuration": "1s",
+			"OnFailureDelayDuration": "15s", // Matches the value used by endpoint-security.
 			"OnFailureResetPeriod":   10,
 		},
 	}