From e88a5bcaabcd7eeb43712afadd837e9e47a107fc Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:37:29 -0500
Subject: [PATCH] Restore support for the memcached/metrics input. (#2298)
 (#2299)

* Restore support for memcached/metrics input.

* Add PR and issue to changelog.

(cherry picked from commit cb63711014d3b9b6ced2b35a246391567f5419c6)

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
---
 ...-support-for-memcached-metrics-inputs.yaml | 27 +++++++++++++++++++
 specs/metricbeat.spec.yml                     |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 changelog/fragments/1677000534-Restore-support-for-memcached-metrics-inputs.yaml

diff --git a/changelog/fragments/1677000534-Restore-support-for-memcached-metrics-inputs.yaml b/changelog/fragments/1677000534-Restore-support-for-memcached-metrics-inputs.yaml
new file mode 100644
index 00000000000..138a9e5855b
--- /dev/null
+++ b/changelog/fragments/1677000534-Restore-support-for-memcached-metrics-inputs.yaml
@@ -0,0 +1,27 @@
+# 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: Restore support for memcached/metrics inputs.
+
+# Affected component; a word indicating the component this changeset affects.
+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/elastic/elastic-agent/pull/2298
+
+# 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/elastic/elastic-agent/issues/2293
diff --git a/specs/metricbeat.spec.yml b/specs/metricbeat.spec.yml
index e26e4399134..10e4a073e5e 100644
--- a/specs/metricbeat.spec.yml
+++ b/specs/metricbeat.spec.yml
@@ -225,6 +225,12 @@ inputs:
     outputs: *outputs
     shippers: *shippers
     command: *command
+  - name: memcached/metrics
+    description: "Memcached metrics"
+    platforms: *platforms
+    outputs: *outputs
+    shippers: *shippers
+    command: *command
   - name: nats/metrics
     description: "NATS metrics"
     platforms: *platforms