OpenShift Logging Dashboard for Elastic Shards shows "active_primary" instead of "active" shards.

The OpenShift Logging Dashboard for Elastic Shards shows the total number of active_primary shards instead of all shards (active). In the docs is stated: "Elastic Shards: The total number of Elasticsearch shards in the Elasticsearch instance." [1]

Current value: 

max(es_cluster_shards_number{type="active_primary"})

Expected value:

max(es_cluster_shards_number{type="active"})

This Bug is a continuing of already fixed LOG-2156; [2]
but the PR was not probably picked correctly to the downstream. [3]

[1] Table 1. OpenShift Logging charts
    https://docs.openshift.com/container-platform/4.9/logging/cluster-logging-dashboards.html

[2] OpenShift Logging - LOG-2156: Dashboard for OpenShift Logging in WebConsole shows incorrect number of shards
    https://issues.redhat.com/browse/LOG-2156

[3] LOG-2156: update (primary) shards expression to (total # of) shards #1417
    https://github.com/openshift/cluster-logging-operator/pull/1417/commits/12020487a0bf057fe375068695703dbc6c9abd43