From 0e0961d146aadc4ca6ef2af4b5e277213a5bf1f5 Mon Sep 17 00:00:00 2001
From: RoberTu <robertu0717@gmail.com>
Date: Thu, 28 Mar 2019 15:29:28 +0800
Subject: [PATCH] Update CHANGELOG for v1.1.1; Monitor EB memory usage in
 CloudWatch;

---
 .ebextensions/eb-memory-monitor.config | 19 +++++++++++++++++++
 CHANGELOG.md                           |  6 ++++++
 package.json                           |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .ebextensions/eb-memory-monitor.config

diff --git a/.ebextensions/eb-memory-monitor.config b/.ebextensions/eb-memory-monitor.config
new file mode 100644
index 0000000000..c42885c9ac
--- /dev/null
+++ b/.ebextensions/eb-memory-monitor.config
@@ -0,0 +1,19 @@
+container_commands:
+  00download:
+    command: "wget http://aws-cloudwatch.s3.amazonaws.com/downloads/CloudWatchMonitoringScripts-1.2.1.zip"
+    ignoreErrors: true
+  01extract:
+    command: "unzip -o CloudWatchMonitoringScripts-1.2.1.zip"
+    ignoreErrors: true
+  02rmzip:
+    command: "rm CloudWatchMonitoringScripts-1.2.1.zip"
+    ignoreErrors: true
+  03prereq:
+    command: "yum install -y perl-Switch perl-DateTime perl-Sys-Syslog perl-LWP-Protocol-https"
+    ignoreErrors: false
+  04cdinto:
+    command: "mv aws-scripts-mon/ /home/ec2-user"
+    ignoreErrors: true
+  05cron:
+    command: "crontab -l | grep -q 'mon-put-instance-data.pl' || crontab -l | { cat; echo '* * * * * /home/ec2-user/aws-scripts-mon/mon-put-instance-data.pl --mem-util --mem-used --mem-avail'; } | crontab -"
+    ignoreErrors: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 712e4f27da..2ec49fef3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2019-03-28
+
+### Added
+
+- Monitor EB memory usage in CloudWatch
+
 ## [1.0.1] - 2019-03-21
 
 ### Added
diff --git a/package.json b/package.json
index 852b58e7fe..cd37c136f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matters-web",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "codebase of Matters' website",
   "author": "",
   "engines": {