diff --git a/scripts/metrics/phab_monitoring.py b/scripts/metrics/phab_monitoring.py
deleted file mode 100755
index 3f68c7b..0000000
--- a/scripts/metrics/phab_monitoring.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-import psycopg2
-from phabricator import Phabricator
-import os
-from typing import Optional
-import datetime
-
-
-def phab_up() -> Optional[Phabricator]:
-    """Try to connect to phabricator to see if the server is up.
-
-    Returns None if server is down.
-    """
-    print("Checking Phabricator status...")
-    try:
-        phab = Phabricator()
-        phab.update_interfaces()
-        print("Phabricator is up...")
-        return phab
-    except exception:
-        pass
-        print("Phabricator is down...")
-    return None
-
-
-def log_phab_status(up: bool, conn: psycopg2.extensions.connection):
-    """log the phabricator status to the database."""
-    print("Writing Phabricator status to database...")
-
-    cur = conn.cursor()
-    cur.execute(
-        "INSERT INTO phab_status (timestamp, status) VALUES (%s,%s);",
-        (datetime.datetime.now(), up),
-    )
-    conn.commit()
-
-
-def connect_to_db() -> psycopg2.extensions.connection:
-    """Connect to the database, create tables as needed."""
-    conn = psycopg2.connect(
-        "host=127.0.0.1 sslmode=disable dbname=stats user={} password={}".format(
-            os.environ["PGUSER"], os.environ["PGPASSWORD"]
-        )
-    )
-    cur = conn.cursor()
-    cur.execute(
-        "CREATE TABLE IF NOT EXISTS phab_status (timestamp timestamp, status boolean);"
-    )
-    conn.commit()
-    return conn
-
-
-def phab_monitoring():
-    """Main function of monitoring the phabricator server."""
-    conn = connect_to_db()
-    phab = phab_up()
-    log_phab_status(phab is not None, conn)
-    print("Completed, exiting...")
-
-
-if __name__ == "__main__":
-    phab_monitoring()
diff --git a/scripts/metrics/requirements.txt b/scripts/metrics/requirements.txt
new file mode 100644
index 0000000..96d29ac
--- /dev/null
+++ b/scripts/metrics/requirements.txt
@@ -0,0 +1,2 @@
+# these files are needed in addition to /scripts/requirments.txt
+psycopg2
\ No newline at end of file
diff --git a/scripts/metrics/server_monitoring.py b/scripts/metrics/server_monitoring.py
new file mode 100755
index 0000000..3ce4d78
--- /dev/null
+++ b/scripts/metrics/server_monitoring.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+
+import psycopg2
+from phabricator import Phabricator
+import os
+from typing import Optional
+import datetime
+import requests
+
+PHABRICATOR_URL = "https://reviews.llvm.org/api/"
+BUILDBOT_URL = "https://lab.llvm.org/buildbot/api/v2/"
+
+
+def phab_up() -> Optional[Phabricator]:
+    """Try to connect to phabricator to see if the server is up.
+
+    Returns None if server is down.
+    """
+    print("Checking Phabricator status...")
+    try:
+        phab = Phabricator(host=PHABRICATOR_URL)
+        phab.update_interfaces()
+        print("  Phabricator is up.")
+        return phab
+    except Exception:
+        pass
+        print("  Phabricator is down.")
+    return None
+
+
+def buildbot_up() -> bool:
+    """Check if buildbot server is up"""
+    print("Checking Buildbot status...")
+    try:
+        response = requests.get(BUILDBOT_URL + "/masters")
+        if "masters" in response.json():
+            print("  Buildbot is up.")
+            return True
+    except Exception:
+        pass
+    print("  Buildbot is down.")
+    return False
+
+
+def log_server_status(phab: bool, buildbot: bool, conn: psycopg2.extensions.connection):
+    """log the phabricator status to the database."""
+    print("Writing Phabricator status to database...")
+
+    cur = conn.cursor()
+    cur.execute(
+        "INSERT INTO server_status (timestamp, phabricator, buildbot) VALUES (%s,%s,%s);",
+        (datetime.datetime.now(), phab, buildbot),
+    )
+    conn.commit()
+
+
+def connect_to_db() -> psycopg2.extensions.connection:
+    """Connect to the database, create tables as needed."""
+    conn = psycopg2.connect(
+        "host=127.0.0.1 sslmode=disable dbname=stats user={} password={}".format(
+            os.environ["PGUSER"], os.environ["PGPASSWORD"]
+        )
+    )
+    cur = conn.cursor()
+    cur.execute(
+        "CREATE TABLE IF NOT EXISTS server_status (timestamp timestamp, phabricator boolean, buildbot boolean);"
+    )
+    conn.commit()
+    return conn
+
+
+def server_monitoring():
+    """Main function of monitoring the servers."""
+    conn = connect_to_db()
+    phab = phab_up()
+    buildbot = buildbot_up()
+    log_server_status(phab is not None, buildbot, conn)
+    print("Completed, exiting...")
+
+
+if __name__ == "__main__":
+    server_monitoring()