Skip to content

Commit

Permalink
Merge branch 'master' into github-zoom-plugin-docs-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@mickmister
mickmister authored May 30, 2024
2 parents d1d0809 + 0d2459e commit c51a9f7
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 17 deletions.
4 changes: 2 additions & 2 deletions source/_static/js/myscript-v1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $(document).ready(function () {
// Fallback for when a notification CTA expires - ie. webinar happens
const dateInFuture = (value) =>
new Date().getTime() <= new Date(value).getTime();
const expiryDate = '2024-03-28T00:00:00-0500';
const expiryDate = '2024-06-07T00:00:00-0500';
// 2024-03-28 @ 12am EST
const fallback_url =
'https://mattermost.com/solutions/mattermost-for-microsoft-teams/';
Expand All @@ -85,7 +85,7 @@ $(document).ready(function () {
// So it will show up for new announcements
// Keep "mm_notification_banner__" at the beginning of the key
// Add system to clean out storage items that are no longer needed
let notification_banner_key = 'mm_notification_banner__webinar-mar-2024-cybersec';
let notification_banner_key = 'mm_notification_banner__webinar-june-2024-ai';
if (!dateInFuture(expiryDate)) {
notification_banner_key = 'mm_notification_banner__fallback-mst';
}
Expand Down
49 changes: 39 additions & 10 deletions source/_templates/custom-nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span aria-hidden="true">×</span>
</a>
<div class="notification-bar__wrapper">
<a href="https://mattermost.com/webinar/cybersecurity-incident-response/" target="_blank" class="notification-bar__link">[WEBINAR] Learn how to secure mission-critical work 🔐</a>
<a href="https://mattermost.com/webinar/ai-collaboration-landscape-of-tomorrow/" target="_blank" class="notification-bar__link">[WEBINAR] How AI is Transforming Mission-Critical Work</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -80,6 +80,11 @@
Integrations
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/mobile/">
Mobile
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/security/">
Security
Expand Down Expand Up @@ -113,13 +118,17 @@
</ul>
<p class="sub-menu__link-col-header sub-menu__header-flex-deploy sub-menu__link-col-header-space">Flexible Deployment</p>
<ul>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/enterprise/on-prem/">
On-Premise
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/enterprise/cloud/">
Cloud
</a>
</li>
</ul>

</div>
</div>
</div>
Expand All @@ -141,7 +150,7 @@
<p class="sub-menu__link-col-header sub-menu__link-col-header-first">Use Cases</p>
<ul>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/use-cases/accelerate-productivity/">
<a href="https://mattermost.com/solutions/use-cases/purpose-built-collaboration/">
Purpose-Built Collaboration Hub
</a>
</li>
Expand All @@ -151,17 +160,17 @@
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/use-cases/chatops/">
<a href="https://mattermost.com/solutions/use-cases/mission-critical-chatops/">
Mission-Critical ChatOps
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/use-cases/devops/">
<a href="https://mattermost.com/solutions/use-cases/devsecops-collaboration/">
Real-Time DevSecOps Collaboration
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/use-cases/secure-collaboration/">
<a href="https://mattermost.com/solutions/use-cases/integrated-security-operations/">
Integrated Security Operations
</a>
</li>
Expand All @@ -175,9 +184,24 @@
<div class="sub-menu__solutions-link-col">
<p class="sub-menu__link-col-header sub-menu__link-col-header-space">Industries</p>
<ul>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/critical-infrastructure/">
Critical Infrastructure
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/defense/">
Defense
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/technology/">
Technology
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/government/">
Government
Global Public Sector
</a>
</li>
<li class="sub-menu__links--single">
Expand All @@ -186,8 +210,13 @@
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/healthcare/">
Healthcare
<a href="https://mattermost.com/solutions/industries/energy-and-utilities/">
Energy and Utilities
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://mattermost.com/solutions/industries/manufacturing/">
Manufacturing
</a>
</li>
</ul>
Expand Down Expand Up @@ -372,7 +401,7 @@
</a>
</li>
<li class="sub-menu__links--single">
<a href="https://docs.mattermost.com/guides/repeatable-processes.html">
<a href="https://docs.mattermost.com/guides/administration.html">
Admin
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions source/deploy/postgres-migration.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Once we set the schema to a desired state, we can start migrating the **data** b

.. note::

In the example below, the hosts for both databases are assumed to be in the same instance. Please update addresses accordingly if they are on different machines.
In the example below, the hosts for both databases are assumed to be in the same instance. Please update addresses accordingly if they are on different machines. Also you can test the ``.load`` file by simply running ``pgloader`` with ``--dry-run`` flag. For instance ``pgloader --dry-run migration.load`` command.

\*\* Use the following configuration for the baseline of the data migration:

Expand Down Expand Up @@ -305,7 +305,7 @@ To avoid performance regression on ``Posts`` and ``FileInfo`` table access, foll
Compare the data
~~~~~~~~~~~~~~~~

We internally developed a tool to simplify the process of comparing the contents of two databases. The `dbcmp <https://github.com/mattermost/dbcmp>`__ tool compares every table and reports whether there is a diversion between two schemas.
We internally developed a tool to simplify the process of comparing the contents of two databases. The ``dbcmp`` tool compares every table and reports whether there is a diversion between two schemas. Note that ``dbcmp`` does not compare individual rows, instead, it calculates the checksum value of given ``page-size`` and compares those values. This means it cannot calculate or provide diffs on individual rows.

The tool includes a few flags to run a comparison:

Expand Down
1 change: 1 addition & 0 deletions source/scale/collect-performance-metrics.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ For a self-hosted Mattermost deployment, a Mattermost system admin must perform
3. Go to **System Console > Plugins > Plugin Management > Upload Plugin**, and upload the plugin binary you downloaded in the previous step.
4. Go to **System Console > Plugins > Plugin Management**. In the **Installed Plugins** section, scroll to **Mattermost Metrics Plugin**, and select **Enable Plugin**.
5. Specify the path of the time-series database, and select **Save**.
6. Go to **System Console > Plugins > Performance Monitoring**, and set **Enable Performance Monitoring** to **true**. Select **Save**.

Upgrade
-------
Expand Down
6 changes: 3 additions & 3 deletions source/scale/deploy-prometheus-grafana-for-performance-monitoring.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Deploy Prometheus and Grafana for performance monitoring

<p class="mm-label-note">Also available in legacy Mattermost Enterprise Edition E20</p>

Performance monitoring support enables admins to track system health for large Enterprise deployments through integrations with `Prometheus <https://prometheus.io/>`__ and `Grafana <https://grafana.org/>`__. These integrations support data collection from several Mattermost servers, which is particularly useful if you're running Mattermost `in high availability mode </scale/high-availability-cluster.html>`__. Once you're tracking system health, you can `set up performance alerts </scale/performance-alerting.html>`__ on your Grafana dashboard.
Performance monitoring support enables admins to track system health for large Enterprise deployments through integrations with `Prometheus <https://prometheus.io/>`__ and `Grafana <https://grafana.org/>`__. These integrations support data collection from several Mattermost servers, which is particularly useful if you're running Mattermost :doc:`in high availability mode </scale/high-availability-cluster>`. Once you're tracking system health, you can :doc:`set up performance alerts </scale/performance-alerting>` on your Grafana dashboard.

Admins can collect and store various data points from the Mattermost application in an `OpenMetrics <https://openmetrics.io>`__ format by `deploying the Mattermost Metrics plugin <#mattermost-metrics-plugin>`__, or by `deploying Prometheus <#install-prometheus>`__ and `Grafana <#install-grafana>`__.
Admins can collect and store various data points from the Mattermost application in an `OpenMetrics <https://openmetrics.io>`__ format by `deploying Prometheus <#install-prometheus>`__ and `Grafana <#install-grafana>`__.

.. tip::

Don't want to deploy Prometheus and Grafana? You can also :doc: `collect performance metrics using the Mattermost Metrics plugin </scale/collect-performance-metrics-using-metrics-plugin>`.
Don't want to deploy Prometheus and Grafana? You can also :doc:`collect performance metrics using the Mattermost Metrics plugin </scale/collect-performance-metrics>`.

Install Prometheus
-------------------
Expand Down

0 comments on commit c51a9f7

Please sign in to comment.